diff options
| -rw-r--r-- | FL/Fl_Device.H | 7 | ||||
| -rw-r--r-- | FL/Fl_Paged_Device.H | 1 | ||||
| -rw-r--r-- | FL/Fl_Printer.H | 3 | ||||
| -rw-r--r-- | FL/fl_draw.H | 7 | ||||
| -rw-r--r-- | FL/mac.H | 1 |
5 files changed, 9 insertions, 10 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index 6b19b914d..bb369d917 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -33,18 +33,11 @@ #ifndef Fl_Device_H #define Fl_Device_H -#include <FL/x.H> #include <FL/Fl_Plugin.H> #include <FL/Fl_Image.H> #include <FL/Fl_Bitmap.H> #include <FL/Fl_Pixmap.H> #include <FL/Fl_RGB_Image.H> -#ifdef WIN32 -#include <commdlg.h> -#elif defined(__APPLE__) -#else -#include <stdio.h> -#endif class Fl_Graphics_Driver; class Fl_Display_Device; diff --git a/FL/Fl_Paged_Device.H b/FL/Fl_Paged_Device.H index 8de4f623b..1efb2aed1 100644 --- a/FL/Fl_Paged_Device.H +++ b/FL/Fl_Paged_Device.H @@ -33,6 +33,7 @@ #define Fl_Paged_Device_H #include <FL/Fl_Device.H> +#include <FL/Fl_Window.H> /** \brief Number of elements in enum Page_Format */ #define NO_PAGE_FORMATS 30 /* MSVC6 compilation fix */ diff --git a/FL/Fl_Printer.H b/FL/Fl_Printer.H index 00f85856a..435834f40 100644 --- a/FL/Fl_Printer.H +++ b/FL/Fl_Printer.H @@ -31,6 +31,7 @@ #ifndef Fl_Printer_H #define Fl_Printer_H +#include <FL/x.H> #include <FL/Fl_Paged_Device.H> #include <FL/fl_draw.H> #include <FL/Fl_Pixmap.H> @@ -39,6 +40,8 @@ #include <stdio.h> #if !(defined(__APPLE__) || defined(WIN32)) #include <FL/Fl_PostScript.H> +#elif defined(WIN32) +#include <Commdlg.h> #endif #if defined(__APPLE__) || defined(WIN32) || defined(FL_DOXYGEN) diff --git a/FL/fl_draw.H b/FL/fl_draw.H index ab605c925..71fe6196f 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -33,9 +33,10 @@ #ifndef fl_draw_H #define fl_draw_H -#include "Enumerations.H" // for the color names -#include "Fl_Window.H" // for fl_set_spot() -#include "Fl_Device.H" +#include <FL/x.H> // for Fl_Region +#include <FL/Enumerations.H> // for the color names +#include <FL/Fl_Window.H> // for fl_set_spot() +#include <FL/Fl_Device.H> // for fl_graphics_driver // Image class... class Fl_Image; @@ -33,6 +33,7 @@ #if !defined(Fl_X_H) # error "Never use <FL/mac.H> directly; include <FL/x.H> instead." #endif // !Fl_X_H +#include <FL/Fl_Widget.H> typedef void* Window; // this is really a pointer to the subclass FLWindow of NSWindow typedef void* Fl_Offscreen; // this is really a CGContextRef |