From d93fc2bfa6b3bd5c33912e2eaaa2d42dfd5f473f Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Tue, 16 Feb 2021 11:08:30 +0100 Subject: [PATCH] Use when appropriate. --- src/Fl_Device.cxx | 2 +- src/Fl_Gl_Choice.cxx | 2 +- src/Fl_Gl_Device_Plugin.cxx | 2 +- src/Fl_Gl_Overlay.cxx | 2 +- src/Fl_Graphics_Driver.cxx | 2 +- src/Fl_Image.cxx | 2 +- src/Fl_cocoa.mm | 2 +- src/Fl_win32.cxx | 2 +- src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 2 +- src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx | 2 +- src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx | 3 +-- src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 2 +- src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx | 1 - src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 2 +- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx | 1 - src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx | 3 +-- src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx | 1 - src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx | 1 - src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx | 1 - src/drivers/Posix/Fl_Posix_Printer_Driver.cxx | 6 +++--- src/drivers/Posix/Fl_Posix_System_Driver.H | 2 +- src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx | 2 +- src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx | 5 +---- src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx | 2 +- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 +- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 2 +- src/drivers/X11/Fl_X11_Screen_Driver.cxx | 2 +- src/drivers/X11/Fl_X11_System_Driver.H | 2 +- src/drivers/X11/Fl_X11_Window_Driver.cxx | 2 +- src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx | 3 +-- src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx | 2 +- src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx | 2 +- src/gl_draw.cxx | 2 +- src/gl_start.cxx | 2 +- 35 files changed, 32 insertions(+), 43 deletions(-) diff --git a/src/Fl_Device.cxx b/src/Fl_Device.cxx index 30726b181..f977210f8 100644 --- a/src/Fl_Device.cxx +++ b/src/Fl_Device.cxx @@ -14,8 +14,8 @@ // https://www.fltk.org/bugs.php // +#include #include -#include "config_lib.h" #include #include diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx index 993687316..e44470469 100644 --- a/src/Fl_Gl_Choice.cxx +++ b/src/Fl_Gl_Choice.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "config_lib.h" +#include #if HAVE_GL # include diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx index f2bdb4e78..79188ed66 100644 --- a/src/Fl_Gl_Device_Plugin.cxx +++ b/src/Fl_Gl_Device_Plugin.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "config_lib.h" +#include #include #include #include "drivers/OpenGL/Fl_OpenGL_Display_Device.H" diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx index 04c906adc..043a21308 100644 --- a/src/Fl_Gl_Overlay.cxx +++ b/src/Fl_Gl_Overlay.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "config_lib.h" +#include #if HAVE_GL #include diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx index 815ef2aee..d33e5e50f 100644 --- a/src/Fl_Graphics_Driver.cxx +++ b/src/Fl_Graphics_Driver.cxx @@ -20,8 +20,8 @@ \{ */ +#include #include -#include "config_lib.h" #include #include "Fl_Screen_Driver.H" #include diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index d38148c8d..81a15416e 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "config_lib.h" +#include #include #include #include diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index e67e9646a..15ed5fbd5 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -20,7 +20,7 @@ extern "C" { #include } -#include "config_lib.h" +#include #include #include #include "Fl_Window_Driver.H" diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 49f71567d..1e5b73248 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -49,7 +49,7 @@ void fl_free_fonts(void); void fl_release_dc(HWND, HDC); void fl_cleanup_dc_list(void); -#include "config_lib.h" +#include #include #include #include "Fl_Window_Driver.H" diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index 1984ae909..651da1f1d 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_Cocoa_Screen_Driver.H" #include "Fl_Cocoa_Window_Driver.H" #include "../Quartz/Fl_Font.H" diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx index ed2772b42..1b6205ceb 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_Cocoa_Window_Driver.H" #include "../../Fl_Screen_Driver.H" #include "../Quartz/Fl_Quartz_Graphics_Driver.H" diff --git a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx index f4358949a..7117c6c49 100644 --- a/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Copy_Surface_Driver.cxx @@ -14,8 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" - +#include #include #include #include "Fl_GDI_Graphics_Driver.H" diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index b70f579cb..dd9ed5dbc 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_GDI_Graphics_Driver.H" #include #include diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx index 50e00c5a9..8e45c6eb9 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx @@ -21,7 +21,6 @@ */ #include -#include "../../config_lib.h" #include #include #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index b1fb688bc..48a185410 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" +#include #include #include "../../Fl_Gl_Window_Driver.H" #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx index c4efee207..ba5a7e7d7 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx @@ -20,7 +20,6 @@ */ #include -#include "../../config_lib.h" #include "Fl_OpenGL_Graphics_Driver.H" #include #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx index f6fcbb8a4..54810cabf 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx @@ -19,8 +19,7 @@ \brief Color handling */ -#include "../../config_lib.h" -// #include +#include #include "Fl_OpenGL_Graphics_Driver.H" #include #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx index 24ce5396b..fc6bc48c1 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx @@ -26,7 +26,6 @@ #include -#include "../../config_lib.h" #include "Fl_OpenGL_Graphics_Driver.H" #include #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx index 8b5bf35a1..89dea699d 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx @@ -20,7 +20,6 @@ */ #include -#include "../../config_lib.h" #include "Fl_OpenGL_Graphics_Driver.H" #include #include diff --git a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx index 049a6060a..f47aaab27 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx @@ -21,7 +21,6 @@ */ #include -#include "../../config_lib.h" #include "Fl_OpenGL_Graphics_Driver.H" #include #include diff --git a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx index 5fcb4645a..904c6d334 100644 --- a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx +++ b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx @@ -14,9 +14,9 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" +#include -#if defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT) +#if !defined(FL_NO_PRINT_SUPPORT) #include #include "../PostScript/Fl_PostScript_Graphics_Driver.H" @@ -331,4 +331,4 @@ int Fl_Posix_Printer_Driver::begin_job(int pages, int *firstpage, int *lastpage, return ps->start_postscript(pages, format, layout); // start printing } -#endif // defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT) +#endif // !defined(FL_NO_PRINT_SUPPORT) diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H index 365cce8e8..e077e490f 100644 --- a/src/drivers/Posix/Fl_Posix_System_Driver.H +++ b/src/drivers/Posix/Fl_Posix_System_Driver.H @@ -23,7 +23,7 @@ #ifndef FL_POSIX_SYSTEM_DRIVER_H #define FL_POSIX_SYSTEM_DRIVER_H -#include "../../config_lib.h" +#include #include "../../Fl_System_Driver.H" #include #include diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H index 66f1b6ba7..d41a0a55e 100644 --- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H +++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H @@ -21,7 +21,7 @@ #ifndef FL_POSTSCRIPT_GRAPHICS_DRIVER_H #define FL_POSTSCRIPT_GRAPHICS_DRIVER_H -#include "../../config_lib.h" +#include #include #ifndef USE_PANGO diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx index 1c5c7e977..9d82d5c73 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" +#include #include "Fl_Quartz_Graphics_Driver.H" #include "../Darwin/Fl_Darwin_System_Driver.H" #include diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx index 98c37617c..dd73fc877 100644 --- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_image.cxx @@ -14,11 +14,8 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" - -#include "Fl_Quartz_Graphics_Driver.H" - #include +#include "Fl_Quartz_Graphics_Driver.H" #include #include #include diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index d28cccae8..7c57d08f2 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_WinAPI_Screen_Driver.H" #include "../GDI/Fl_Font.H" #include diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 518b32845..9c9d35553 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -14,7 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" +#include #include "Fl_WinAPI_System_Driver.H" #include #include diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index 8d0fddcd4..6e5d693f4 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include #include #include diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index ec3a6e0d2..33f087d36 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_X11_Screen_Driver.H" #include "../Xlib/Fl_Font.H" #include "Fl_X11_Window_Driver.H" diff --git a/src/drivers/X11/Fl_X11_System_Driver.H b/src/drivers/X11/Fl_X11_System_Driver.H index 004e474ae..b4ade96a3 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.H +++ b/src/drivers/X11/Fl_X11_System_Driver.H @@ -18,7 +18,7 @@ #ifndef FL_X11_SYSTEM_DRIVER_H #define FL_X11_SYSTEM_DRIVER_H -#include "../../config_lib.h" +#include #include "../Posix/Fl_Posix_System_Driver.H" class Fl_X11_System_Driver : public Fl_Posix_System_Driver { diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx index d757aa752..ab15f275c 100644 --- a/src/drivers/X11/Fl_X11_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_X11_Window_Driver.H" #include "Fl_X11_Screen_Driver.H" #include "../Xlib/Fl_Xlib_Graphics_Driver.H" diff --git a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx index 738b5a493..0343e9a9c 100644 --- a/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.cxx @@ -14,8 +14,7 @@ // https://www.fltk.org/bugs.php // -#include "../../config_lib.h" - +#include #include #include #include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx index 46f44460c..309df9e91 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.cxx @@ -15,7 +15,7 @@ // -#include "../../config_lib.h" +#include #include "Fl_Xlib_Graphics_Driver.H" #include "Fl_Font.H" #include diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx index ab591da09..4a2b48af9 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx @@ -19,7 +19,7 @@ \brief X11 Xlib specific line and polygon drawing with integer coordinates. */ -#include "../../config_lib.h" +#include #include #include #include diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 125e68c31..234edf275 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -29,7 +29,7 @@ get_list(), gl_bitmap_font() and draw_string_legacy() for the platform's Fl_XXX_Gl_Window_Driver. */ -#include "config_lib.h" +#include #if HAVE_GL || defined(FL_DOXYGEN) diff --git a/src/gl_start.cxx b/src/gl_start.cxx index f96786c8e..81a704333 100644 --- a/src/gl_start.cxx +++ b/src/gl_start.cxx @@ -26,7 +26,7 @@ // be erased when the buffers are swapped (when double buffer hardware // is being used) -#include "config_lib.h" +#include #if HAVE_GL #include