diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window.H | 1 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 1 | ||||
| -rw-r--r-- | FL/porting.H | 2 | ||||
| -rw-r--r-- | FL/x.H | 18 |
4 files changed, 2 insertions, 20 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 63aa67ec0..2888b85fc 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -73,6 +73,7 @@ class FL_EXPORT Fl_Window : public Fl_Group { friend class Fl_X; friend class Fl_Window_Driver; friend class Fl_PicoSDL_Window_Driver; + friend class Fl_PicoAndroid_Window_Driver; Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped Fl_Window_Driver *pWindowDriver; // points at the system-specific stuff at window creatino time diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index 2ab4bf192..d36774535 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -28,6 +28,7 @@ class Fl_Window; +class Fl_X; class Fl_Image; diff --git a/FL/porting.H b/FL/porting.H index 01984aa71..d2a51912a 100644 --- a/FL/porting.H +++ b/FL/porting.H @@ -24,7 +24,6 @@ # error "Never use <FL/porting.H> directly; include <FL/x.H> instead." #endif // !Fl_X_H - typedef void *Window; #if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program @@ -61,7 +60,6 @@ extern void *fl_default_cursor; // This object contains all platform-specific stuff about a window: // WARNING: this object is highly subject to change! class Fl_X { - public: Window xid; // pointer to the native window object (FLWindow*) Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window) @@ -31,26 +31,8 @@ # include "win32.H" # elif defined(__APPLE__) // PORTME: Fl_Window_Driver - Fl_X Window Driver interface # include "mac.H" -# elif defined(ANDROID) -# pragma message "A clean port requires a driver-style system for Fl_X" # elif defined(USE_SDL) # pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" - -//typedef void *Window; -//typedef void *Fl_Region; -//typedef void *Fl_Bitmask; -//typedef void *Fl_Offscreen; -//#include <FL/Fl_Window.H> -//class FL_EXPORT Fl_X { -//public: -// Window xid; -// Window other_xid; -// Fl_X *next; -// char wait_for_expose; -// static Fl_X* first; -// static Fl_X* i(const Fl_Window* wi) {return (Fl_X*)wi->i;} -//}; - # include "porting.H" # elif defined(FL_PORTING) # pragma message "FL_PORTING: write a header file based on this file, win32.H, or mac.H to define the FLTK core internals" |