From c456dd4eb7a2325bf75b5185c2645b2552d99516 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 27 Mar 2016 17:37:07 +0000 Subject: Remove a bunch of unnecessary #include directives git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11443 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_BMP_Image.cxx | 1 - src/Fl_Window_Driver.cxx | 1 - src/Fl_get_key_mac.cxx | 1 - src/Fl_grab.cxx | 1 - src/Fl_visual.cxx | 1 - src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx | 1 - src/fl_color.cxx | 2 -- src/fl_read_image_mac.cxx | 4 +--- src/fl_rect.cxx | 9 ++------- src/fl_vertex.cxx | 4 +--- 10 files changed, 4 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx index bcbac4ebb..234d6b2ce 100644 --- a/src/Fl_BMP_Image.cxx +++ b/src/Fl_BMP_Image.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx index acb00712c..012eb9a93 100644 --- a/src/Fl_Window_Driver.cxx +++ b/src/Fl_Window_Driver.cxx @@ -18,7 +18,6 @@ // -#include #include #include #include diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx index 52d99e222..358678015 100644 --- a/src/Fl_get_key_mac.cxx +++ b/src/Fl_get_key_mac.cxx @@ -20,7 +20,6 @@ // which are actually X keysyms. So this has to translate to macOS // symbols. -#include #include #include diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx index f014c14d7..5a33e4b7c 100644 --- a/src/Fl_grab.cxx +++ b/src/Fl_grab.cxx @@ -16,7 +16,6 @@ // http://www.fltk.org/str.php // -#include #include #include diff --git a/src/Fl_visual.cxx b/src/Fl_visual.cxx index e3c08806e..eaa0f776b 100644 --- a/src/Fl_visual.cxx +++ b/src/Fl_visual.cxx @@ -18,7 +18,6 @@ // Set the default visual according to passed switches: -#include #include #include diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx index 4af0b129f..54740fc10 100644 --- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx @@ -17,7 +17,6 @@ // -#include #include "../../config_lib.h" #include "Fl_GDI_Graphics_Driver.H" #include diff --git a/src/fl_color.cxx b/src/fl_color.cxx index 4fa08dd08..c3021e7ea 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -26,8 +26,6 @@ #include #include #include -#include -#include "config_lib.h" // fl_cmap needs to be defined globally (here) and is used in the device // specific graphics drivers diff --git a/src/fl_read_image_mac.cxx b/src/fl_read_image_mac.cxx index 3d84c80a2..36f2ad017 100644 --- a/src/fl_read_image_mac.cxx +++ b/src/fl_read_image_mac.cxx @@ -1,7 +1,7 @@ // // "$Id$" // -// WIN32 image reading routines for the Fast Light Tool Kit (FLTK). +// Mac OS image reading routines for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2016 by Bill Spitzak and others. // @@ -16,8 +16,6 @@ // http://www.fltk.org/str.php // -#include - // // 'fl_read_image()' - Read an image from the current window or off-screen buffer. // diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx index d8709d8e0..af096d390 100644 --- a/src/fl_rect.cxx +++ b/src/fl_rect.cxx @@ -26,13 +26,8 @@ // Also all fl_clip routines, since they are always linked in so // that minimal update works. -#include -#include "config_lib.h" -#include #include -#include -#include -#include +#include // ----------------------------------------------------------------------------- // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx @@ -53,7 +48,7 @@ void Fl_Graphics_Driver::clip_region(Fl_Region r) { Fl_Region oldr = rstack[rstackptr]; if (oldr) XDestroyRegion(oldr); rstack[rstackptr] = r; - fl_restore_clip(); + restore_clip(); } diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx index 1a425895c..e108d2163 100644 --- a/src/fl_vertex.cxx +++ b/src/fl_vertex.cxx @@ -32,9 +32,7 @@ // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx // ----------------------------------------------------------------------------- -#include -#include "config_lib.h" -#include +#include #include #include #include -- cgit v1.2.3