summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-03-11 09:28:56 +0000
committerManolo Gouy <Manolo>2016-03-11 09:28:56 +0000
commit28f24b1b6f57a1b3bdd435565290fa60a155b66f (patch)
tree46ee75584ff03c2f6113861fa3e9b27e5eaf8855 /src/drivers
parent408d0672a4b50dc7f9d8babd6d03f5cdcbe034da (diff)
Remove a few #include <FL/x.H> from public FLTK headers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11347 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H2
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx2
-rw-r--r--src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H2
-rw-r--r--src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx4
-rw-r--r--src/drivers/X11/Fl_X11_Window_Driver.H1
5 files changed, 8 insertions, 3 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
index 12dbead09..63b0524ac 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
@@ -26,7 +26,7 @@
#define FL_COCOA_SCREEN_DRIVER_H
#include <FL/Fl_Screen_Driver.H>
-
+#include <FL/x.H> // for XRectangle
/*
Move everything here that manages the native screen interface.
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
index 8da0ab610..2d2d6675b 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx
@@ -18,7 +18,7 @@
#include "../../config_lib.h"
-#include "Fl_Cocoa_Screen_Driver.h"
+#include "Fl_Cocoa_Screen_Driver.H"
#include <FL/Fl.H>
#include <FL/x.H>
#include <FL/Fl_Graphics_Driver.H>
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
index 26061655c..1bbcb00ee 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H
@@ -26,7 +26,7 @@
#define FL_WINAPI_SCREEN_DRIVER_H
#include <FL/Fl_Screen_Driver.H>
-
+#include <windows.h>
class Fl_Window;
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index f1b086566..01f5225bd 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -19,6 +19,10 @@
#include "../../config_lib.h"
#include <FL/Fl.H>
+#include <FL/Fl_Image.H>
+#include <FL/Fl_Bitmap.H>
+#include <FL/Fl_Window.H>
+#include <FL/x.H>
#include "Fl_WinAPI_Window_Driver.H"
#include <windows.h>
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index 2d42b4410..3e4a80880 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -26,6 +26,7 @@
#define FL_X11_WINDOW_DRIVER_H
#include <FL/Fl_Window_Driver.H>
+class Fl_Bitmap;
/*
Move everything here that manages the native window interface.