Move Fl_Screen_Driver.H from FL/ to src/

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12975 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
fltk · Jun 26, 2018 · 26cb08b · 26cb08b
1 parent 7ebe8e2
commit 26cb08b
Show file tree

Hide file tree

Showing 35 changed files with 63 additions and 63 deletions.
diff --git a/src/Fl.cxx b/src/Fl.cxx
@@ -20,7 +20,7 @@
 
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include "Fl_Window_Driver.H"
 #include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Window.H>

diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
@@ -611,7 +611,7 @@ char Fl_Cocoa_Gl_Window_Driver::swap_type() {return COPY;}
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
 #include <FL/platform.H>
 #include <FL/Fl_Graphics_Driver.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w)
 {
@@ -703,7 +703,7 @@ void* Fl_WinAPI_Gl_Window_Driver::GetProcAddress(const char *procName) {
 #if defined(FL_CFG_GFX_XLIB)
 #include <FL/platform.H>
 #include "Fl_Gl_Choice.H"
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include "Fl_Window_Driver.H"
 
 Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w)

diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx
@@ -25,7 +25,7 @@
 #include <FL/Fl.H>
 #include "config_lib.h"
 #include <FL/Fl_Graphics_Driver.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_Image.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Image_Surface.H>

diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx
@@ -28,7 +28,7 @@
 #include <FL/platform.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_System_Driver.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_Input.H>
 #include <FL/fl_draw.H>
 #include <FL/fl_ask.H>

diff --git a/src/Fl_Input_.cxx b/src/Fl_Input_.cxx
@@ -19,7 +19,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Input_.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/fl_draw.H>
 #include <FL/fl_ask.H>
 #include <math.h>

diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx
@@ -23,7 +23,7 @@
 #include <FL/Fl_SVG_Image.H>
 #include <FL/fl_utf8.h>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <stdio.h>
 #include <stdlib.h>
 #if defined(HAVE_LIBZ)

diff --git a/FL/Fl_Screen_Driver.H → src/Fl_Screen_Driver.H b/FL/Fl_Screen_Driver.H → src/Fl_Screen_Driver.H
diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx
@@ -22,7 +22,7 @@
  \{
  */
 
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_Image.H>
 #include <FL/Fl.H>
 #include <FL/platform.H> // for fl_window

diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx
@@ -31,7 +31,7 @@
 #include <FL/Fl_Text_Buffer.H>
 #include <FL/Fl_Text_Display.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 #undef min
 #undef max

diff --git a/src/Fl_Text_Editor.cxx b/src/Fl_Text_Editor.cxx
@@ -24,7 +24,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Text_Editor.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/fl_ask.H>
 
 /* Keyboard Control Matrix

diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx
@@ -21,7 +21,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include "Fl_Window_Driver.H"
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 
 /** The constructor.

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
@@ -38,7 +38,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include "Fl_Window_Driver.H"
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
 #include <FL/Fl_Printer.H>

diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx
@@ -22,7 +22,7 @@ Utility functions to support text input.
 */
 
 #include <FL/Fl.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 #ifndef FL_DOXYGEN
 int Fl::compose_state = 0;

diff --git a/src/Fl_display.cxx b/src/Fl_display.cxx
@@ -20,7 +20,7 @@
 // Using setenv makes programs that are exec'd use the same display.
 
 #include <FL/Fl.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 /**
  \brief Sets the X display to use for all windows.  

diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
@@ -17,7 +17,7 @@
 //
 
 #include <FL/Fl.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_System_Driver.H>
 #include <FL/fl_draw.H>
 #include <FL/platform.H>

diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx
@@ -17,7 +17,7 @@
 //
 
 #include <FL/Fl.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 ////////////////////////////////////////////////////////////////
 // "Grab" is done while menu systems are up.  This has several effects:

diff --git a/src/Fl_visual.cxx b/src/Fl_visual.cxx
@@ -19,7 +19,7 @@
 // Set the default visual according to passed switches:
 
 #include <FL/Fl.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 /** \fn  Fl::visual(int flags)
     Selects a visual so that your graphics are drawn correctly.  This is

diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
@@ -55,7 +55,7 @@ void fl_cleanup_dc_list(void);
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include "Fl_Window_Driver.H"
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
 #include "drivers/WinAPI/Fl_WinAPI_System_Driver.H"

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
@@ -19,7 +19,7 @@
 #include <FL/Fl_Paged_Device.H>
 #include <FL/Fl_Printer.H>
 #include "../../Fl_Window_Driver.H"
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 #include "../Quartz/Fl_Quartz_Graphics_Driver.H"
 #include "../Darwin/Fl_Darwin_System_Driver.H"
 #include "Fl_Cocoa_Window_Driver.H"

diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_COCOA_SCREEN_DRIVER_H
 #define FL_COCOA_SCREEN_DRIVER_H
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 
 /*
  Move everything here that manages the native screen interface.

diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -22,7 +22,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 
 /*
  * By linking this module, the following static method will instantiate the

diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -93,7 +93,7 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw,
 
 #else
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 #include "../../Fl_Window_Driver.H"
 Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h)
 /* captures a rectangle of a Fl_Gl_Window window, and returns it as a RGB image

diff --git a/src/drivers/Pico/Fl_Pico_Screen_Driver.H b/src/drivers/Pico/Fl_Pico_Screen_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_PICO_SCREEN_DRIVER_H
 #define FL_PICO_SCREEN_DRIVER_H
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 
 
 class FL_EXPORT Fl_Pico_Screen_Driver : public Fl_Screen_Driver

diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_WINAPI_SCREEN_DRIVER_H
 #define FL_WINAPI_SCREEN_DRIVER_H
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 #include <windows.h>
 
 class Fl_Window;

diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_X11_SCREEN_DRIVER_H
 #define FL_X11_SCREEN_DRIVER_H
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 
 
 class Fl_Window;

diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -22,7 +22,7 @@
 #include "Fl_X11_Screen_Driver.H"
 #include "../Xlib/Fl_Xlib_Graphics_Driver.H"
 
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 #include <FL/Fl_Overlay_Window.H>
 #include <FL/Fl_Menu_Window.H>
 #include <FL/Fl_Tooltip.H>

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -53,7 +53,7 @@
 #  include <FL/fl_draw.H>
 #  include <FL/platform.H>
 #  include <FL/Fl_Image_Surface.H>
-#  include <FL/Fl_Screen_Driver.H>
+#  include "../../Fl_Screen_Driver.H"
 #  include "../../Fl_XColor.H"
 #  include "../../flstring.h"
 #if HAVE_XRENDER

diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx
@@ -18,7 +18,7 @@
 
 #include "Fl_Xlib_Graphics_Driver.H"
 #include <FL/Fl_Image_Surface.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "../../Fl_Screen_Driver.H"
 
 class Fl_Xlib_Image_Surface_Driver : public Fl_Image_Surface_Driver {
   virtual void end_current_();

diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
@@ -41,7 +41,7 @@
 #include <FL/Fl_Input.H>
 #include <FL/Fl_Secret_Input.H>
 #include <FL/platform.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/fl_draw.H>
 
 static Fl_Window *message_form;

diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx
@@ -35,7 +35,7 @@ static int px,py,pw,ph;
 
 #ifndef USE_XOR
 #include <stdlib.h>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include <FL/Fl_RGB_Image.H>
 static Fl_RGB_Image *s_bgN = 0, *s_bgS = 0, *s_bgE = 0, *s_bgW = 0;
 

diff --git a/src/fl_read_image.cxx b/src/fl_read_image.cxx
@@ -18,7 +18,7 @@
 
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 
 /**
  Reads an RGB(A) image from the current window or off-screen buffer.

diff --git a/src/fl_set_font.cxx b/src/fl_set_font.cxx
@@ -22,7 +22,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Screen_Driver.H>
+#include "Fl_Screen_Driver.H"
 #include "flstring.h"
 #include <stdlib.h>
 

diff --git a/src/glut_compatibility.cxx b/src/glut_compatibility.cxx
@@ -29,7 +29,7 @@
 #include "flstring.h"
 #if HAVE_GL
 #  include <FL/Fl_Gl_Window_Driver.H>
-#  include <FL/Fl_Screen_Driver.H>
+#  include "Fl_Screen_Driver.H"
 #  include <FL/glut.H>
 #  define MAXWINDOWS 32