From d40b765c8614727c7fdedce01ebfaabc079626ef Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 19 Apr 2016 22:49:05 +0000 Subject: Fixed Fl_X for Pico git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11669 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/porting.H | 36 ++++++++++++------------ src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx | 26 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/FL/porting.H b/FL/porting.H index 26504b77c..6ad58a7e4 100644 --- a/FL/porting.H +++ b/FL/porting.H @@ -47,24 +47,24 @@ inline void fl_open_callback(void (*)(const char *)) {} // 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) - Fl_Window *w; // FLTK window for - Fl_Region region; - Fl_X *next; // chain of mapped windows - int wait_for_expose; - static Fl_X* first; - static Fl_X* i(const Fl_Window* w) {return w->i;} - static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&); - static Fl_X* make(Fl_Window*); - void flush(); - static void set_default_icons(const Fl_RGB_Image*[], int); - void set_icons(); - int set_cursor(Fl_Cursor); - int set_cursor(const Fl_RGB_Image*, int, int); -}; +//class Fl_X { +//public: +// Window xid; // pointer to the native window object (FLWindow*) +// Fl_Offscreen other_xid; // pointer for offscreen bitmaps (overlay window) +// Fl_Window *w; // FLTK window for +// Fl_Region region; +// Fl_X *next; // chain of mapped windows +// int wait_for_expose; +// static Fl_X* first; +// static Fl_X* i(const Fl_Window* w) {return w->i;} +// static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&); +// static Fl_X* make(Fl_Window*); +// void flush(); +// static void set_default_icons(const Fl_RGB_Image*[], int); +// void set_icons(); +// int set_cursor(Fl_Cursor); +// int set_cursor(const Fl_RGB_Image*, int, int); +//}; extern Window fl_window; diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx index 0560d8e7c..56e90114a 100644 --- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx +++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx @@ -141,19 +141,19 @@ double Fl_PicoSDL_Screen_Driver::wait(double time_to_wait) #include #include -int Fl_X::set_cursor(Fl_Cursor) { return 0; } -int Fl_X::set_cursor(Fl_RGB_Image const*, int, int) { return 0; } - -Window fl_xid(const Fl_Window* w) -{ - Fl_X *temp = Fl_X::i(w); - return temp ? temp->xid : 0; -} - -Fl_X* Fl_X::make(Fl_Window *w) -{ - return w->driver()->makeWindow(); -} +//int Fl_X::set_cursor(Fl_Cursor) { return 0; } +//int Fl_X::set_cursor(Fl_RGB_Image const*, int, int) { return 0; } + +//Window fl_xid(const Fl_Window* w) +//{ +// Fl_X *temp = Fl_X::i(w); +// return temp ? temp->xid : 0; +//} + +//Fl_X* Fl_X::make(Fl_Window *w) +//{ +// return w->driver()->makeWindow(); +//} Window fl_window; -- cgit v1.2.3