mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary #include statements and compilation guards.

Browse Source 
Currently src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx wouldn't
contribute any code to the lib, but it is kept for future extensions.
This file is no longer compiled (see src/CMakeLists.txt and src/Makefile).

Tested (only) under Windows and Linux.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12381 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2017-08-14 17:10:26 +00:00
parent 4198caa780
commit ec951ce695
14 changed files with 40 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -335,7 +335,8 @@ set (GLCPPFILES
set (GL_DRIVER_FILES
drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx
# the following file doesn't contribute any code:
# drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx

4
src/Makefile
View File

@ -190,7 +190,6 @@ GLCPPFILES = \
glut_compatibility.cxx \
glut_font.cxx \
drivers/OpenGL/Fl_OpenGL_Display_Device.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx \
@ -199,6 +198,9 @@ GLCPPFILES = \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx \
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
# the following file currently doesn't contribute code to GLCPPFILES
# drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx
IMGCPPFILES = \
fl_images_core.cxx \
Fl_BMP_Image.cxx \

9
src/drivers/GDI/Fl_GDI_Graphics_Driver_arci.cxx
View File

@ -3,7 +3,7 @@
//
// Arc (integer) drawing functions for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,9 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_GDI_ARCI_CXX
#define FL_CFG_GFX_GDI_ARCI_CXX
/**
\file Fl_GDI_Graphics_Driver_arci.cxx
\brief Utility functions for drawing circles using integers
@ -61,11 +58,9 @@ void Fl_GDI_Graphics_Driver::pie_unscaled(float x, float y, float w, float h, do
LineTo(gc_, xa, ya);
SetPixel(gc_, xa, ya, fl_RGB());
} else Pie(gc_, x, y, x+w, y+h, xa, ya, xb, yb);
} else Pie(gc_, x, y, x+w, y+h, xa, ya, xb, yb);
} else Pie(gc_, x, y, x+w, y+h, xa, ya, xb, yb);
}
#endif // FL_CFG_GFX_GDI_ARCI_CXX
//
// End of "$Id$".
//

32
src/drivers/GDI/Fl_GDI_Graphics_Driver_line_style.cxx
View File

@ -3,7 +3,7 @@
//
// Line style code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,22 +16,17 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_GDI_LINE_STYLE_CXX
#define FL_CFG_GFX_GDI_LINE_STYLE_CXX
#include "../../config_lib.h"
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/x.H>
#include <FL/Fl_Printer.H>
#include "../../flstring.h"
#include <stdio.h>
/**
\file Fl_GDI_Graphics_Driver_line_style.cxx
\brief Line style drawing utility hiding different platforms.
\brief Line style drawing utility for Windows (GDI) platform.
*/
#include <FL/Fl.H>
#include <FL/x.H>
#include <FL/fl_draw.H>
#include <FL/Fl_Printer.H>
#include "Fl_GDI_Graphics_Driver.H"
@ -40,10 +35,13 @@ void Fl_GDI_Graphics_Driver::line_style_unscaled(int style, float width, char* d
// According to Bill, the "default" cap and join should be the
// "fastest" mode supported for the platform. I don't know why
// they should be different (same graphics cards, etc., right?) MRS
static DWORD Cap[4]= {PS_ENDCAP_FLAT, PS_ENDCAP_FLAT, PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE};
static DWORD Join[4]={PS_JOIN_ROUND, PS_JOIN_MITER, PS_JOIN_ROUND, PS_JOIN_BEVEL};
static const DWORD Cap[4] = {PS_ENDCAP_FLAT, PS_ENDCAP_FLAT, PS_ENDCAP_ROUND, PS_ENDCAP_SQUARE};
static const DWORD Join[4] = {PS_JOIN_ROUND, PS_JOIN_MITER, PS_JOIN_ROUND, PS_JOIN_BEVEL};
int s1 = PS_GEOMETRIC | Cap[(style>>8)&3] | Join[(style>>12)&3];
DWORD a[16]; int n = 0;
DWORD a[16];
int n = 0;
if (dashes && dashes[0]) {
s1 |= PS_USERSTYLE;
for (n = 0; n < 16 && *dashes; n++) a[n] = *dashes++;
@ -65,8 +63,6 @@ void Fl_GDI_Graphics_Driver::line_style_unscaled(int style, float width, char* d
fl_current_xmap->pen = newpen;
}
#endif // FL_CFG_GFX_GDI_LINE_STYLE_CXX
//
// End of "$Id$".
//

16
src/drivers/GDI/Fl_GDI_Graphics_Driver_vertex.cxx
View File

@ -3,7 +3,7 @@
//
// Portable drawing routines for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,14 +16,12 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_GDI_VERTEX_CXX
#define FL_CFG_GFX_GDI_VERTEX_CXX
/**
\file Fl_GDI_Graphics_Driver_vertex.cxx
\brief Portable drawing code for drawing arbitrary shapes with
simple 2D transformations, implemented for MSWindows GDI.
*/
\file Fl_GDI_Graphics_Driver_vertex.cxx
\brief Portable drawing code for drawing arbitrary shapes with
simple 2D transformations, implemented for MSWindows GDI.
*/
#include "Fl_GDI_Graphics_Driver.H"
@ -104,8 +102,6 @@ void Fl_GDI_Graphics_Driver::ellipse_unscaled(double xt, double yt, double rx, d
Arc(gc_, llx, lly, llx+w, lly+h, 0,0, 0,0);
}
#endif // FL_CFG_GFX_GDI_VERTEX_CXX
//
// End of "$Id$".
//

14
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.cxx
View File

@ -3,7 +3,7 @@
//
// Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,14 +16,18 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_OPENGL_CXX
#define FL_CFG_GFX_OPENGL_CXX
// Note:
// This file doesn't contribute any code to the library.
// It is kept as a placeholder for future usage.
// This file is not compiled (as of Aug 2017)
//
// Fl_OpenGL_Graphics_Driver is implemented in several files
// named Fl_OpenGL_Graphics_Driver_*.cxx.
// This may be changed in the future.
#include <FL/gl.h>
#include "Fl_OpenGL_Graphics_Driver.H"
#endif // FL_CFG_GFX_OPENGL_RECT_CXX
//
// End of "$Id$".
//

5
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
View File

@ -16,9 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_OPENGL_ARCI_CXX
#define FL_CFG_GFX_OPENGL_ARCI_CXX
/**
\file Fl_OpenGL_Graphics_Driver_arci.cxx
\brief Utility functions for drawing circles using integers
@ -70,8 +67,6 @@ void Fl_OpenGL_Graphics_Driver::pie(int x,int y,int w,int h,double a1,double a2)
glEnd();
}
#endif // FL_CFG_GFX_OPENGL_ARCI_CXX
//
// End of "$Id$".
//

7
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
View File

@ -3,7 +3,7 @@
//
// Line style code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,9 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_OPENGL_LINE_STYLE_CXX
#define FL_CFG_GFX_OPENGL_LINE_STYLE_CXX
/**
\file Fl_OpenGL_Graphics_Driver_line_style.cxx
\brief Line style drawing utility hiding different platforms.
@ -62,8 +59,6 @@ void Fl_OpenGL_Graphics_Driver::line_style(int style, int width, char* dashes) {
}
}
#endif // FL_CFG_GFX_OPENGL_LINE_STYLE_CXX
//
// End of "$Id$".
//

7
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
View File

@ -3,7 +3,7 @@
//
// Rectangle drawing routines for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2016 by Bill Spitzak and others.
// Copyright 1998-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@ -16,9 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_OPENGL_RECT_CXX
#define FL_CFG_GFX_OPENGL_RECT_CXX
/**
\file Fl_OpenGL_Graphics_Driver_rect.cxx
@ -205,8 +202,6 @@ void Fl_OpenGL_Graphics_Driver::restore_clip() {
}
#endif // FL_CFG_GFX_OPENGL_RECT_CXX
//
// End of "$Id$".
//

5
src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
View File

@ -16,9 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_OPENGL_VERTEX_CXX
#define FL_CFG_GFX_OPENGL_VERTEX_CXX
/**
\file Fl_OpenGL_Graphics_Driver_vertex.cxx
\brief Portable drawing code for drawing arbitrary shapes with
@ -131,8 +128,6 @@ void Fl_OpenGL_Graphics_Driver::circle(double cx, double cy, double r) {
}
#endif // FL_CFG_GFX_OPENGL_VERTEX_CXX
//
// End of "$Id$".
//

7
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.cxx
View File

@ -16,21 +16,16 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_XLIB_LINE_STYLE_CXX
#define FL_CFG_GFX_XLIB_LINE_STYLE_CXX
/**
\file Fl_Xlib_Graphics_Driver_line_style.cxx
\brief Line style drawing utility hiding different platforms.
*/
#include "../../config_lib.h"
#include <FL/Fl.H>
#include <FL/fl_draw.H>
#include <FL/x.H>
#include <FL/Fl_Printer.H>
#include "../../flstring.h"
#include <stdio.h>
#include "Fl_Xlib_Graphics_Driver.H"
@ -70,8 +65,6 @@ if (*dashes == 0) ndashes = 0;//against error with very small scaling
if (ndashes) XSetDashes(fl_display, gc_, 0, dashes, ndashes);
}
#endif // FL_CFG_GFX_XLIB_LINE_STYLE_CXX
//
// End of "$Id$".
//

7
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
View File

@ -16,11 +16,6 @@
// http://www.fltk.org/str.php
//
#ifndef FL_CFG_GFX_XLIB_RECT_CXX
#define FL_CFG_GFX_XLIB_RECT_CXX
/**
\file Fl_Xlib_Graphics_Driver_rect.cxx
\brief X11 Xlib specific line and polygon drawing with integer coordinates.
@ -411,8 +406,6 @@ void Fl_Xlib_Graphics_Driver::restore_clip() {
}
}
#endif // FL_CFG_GFX_XLIB_RECT_CXX
//
// End of "$Id$".
//

2
src/fl_vertex.cxx
View File

@ -49,7 +49,7 @@ void Fl_Graphics_Driver::push_matrix() {
void Fl_Graphics_Driver::pop_matrix() {
if (sptr==0)
Fl::error("fl_pop_matrix(): matrix stack underflow.");
else
else
m = stack[--sptr];
}

19
src/makedepend
View File

@ -1132,7 +1132,6 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Image_Surface.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Widget_Surface.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Shared_Image.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_XColor.H flstring.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: config_lib.h ../config.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Export.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/platform_types.h
@ -1155,7 +1154,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Group.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Bitmap.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Image.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Widget.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: flstring.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: flstring.h ../config.h
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Graphics_Driver.H
drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Image.H
@ -1768,22 +1767,6 @@ drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Window_Driver.H
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Window.H ../FL/Fl_Group.H
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Overlay_Window.H
drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Double_Window.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/gl.h ../FL/Enumerations.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/abi-version.h
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Export.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/fl_types.h
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/platform_types.h
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Graphics_Driver.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Device.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Plugin.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Preferences.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Image.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Widget.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Bitmap.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Image.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_Pixmap.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver.o: ../FL/Fl_RGB_Image.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../config.h config_lib.h
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl_Graphics_Driver.H