diff options
| author | Manolo Gouy <Manolo> | 2016-04-20 04:03:03 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-20 04:03:03 +0000 |
| commit | c28b65f5f515d89934c2b7fd20293c8d6bc620be (patch) | |
| tree | a7cff412573e1ef3bd4bba1e2c2a307303baf66b /FL/x.H | |
| parent | f45389d2cfd3eda79efef0c94826b4eb6a4b90ca (diff) | |
Clean #include directives used by x.H, mac.H, win32.H
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11671 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/x.H')
| -rw-r--r-- | FL/x.H | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -24,8 +24,9 @@ #if !defined(Fl_X_H) && !defined(FL_DOXYGEN) # define Fl_X_H -# include "Enumerations.H" -# include <FL/Fl_Device.H> +# include <FL/Fl_Export.H> +# include <FL/platform_types.h> +class Fl_Window; # ifdef WIN32 # include "win32.H" @@ -38,6 +39,8 @@ # pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" # include "porting.H" # else // X11 +# include <FL/fl_types.h> +# include <FL/Enumerations.H> # ifndef USE_X11 # define USE_X11 1 # endif @@ -50,7 +53,6 @@ # pragma reset woff 3322 # endif # include <X11/Xatom.h> -# include "Fl_Window.H" FL_EXPORT void fl_open_display(Display*); @@ -60,7 +62,6 @@ extern FL_EXPORT int fl_screen; extern FL_EXPORT XVisualInfo *fl_visual; extern FL_EXPORT Colormap fl_colormap; - // drawing functions: extern FL_EXPORT GC fl_gc; FL_EXPORT ulong fl_xpixel(Fl_Color i); @@ -114,6 +115,7 @@ extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid() // cross-platform declarations // #if defined(FL_LIBRARY) || defined(FL_INTERNALS) +# include <FL/Fl_Window.H> class FL_EXPORT Fl_X { public: |