diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window_Driver.H | 4 | ||||
| -rw-r--r-- | FL/mac.H | 3 | ||||
| -rw-r--r-- | FL/win32.H | 4 | ||||
| -rw-r--r-- | FL/x.H | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index f8f5e1bfb..8f167d3a1 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -139,6 +139,10 @@ public: virtual void show_with_args_end(int argc, char **argv) {} virtual int can_do_overlay(); virtual void redraw_overlay(); + + // --- window cursor stuff + virtual int set_cursor(Fl_Cursor); + virtual int set_cursor(const Fl_RGB_Image*, int, int); // --- window shape stuff void shape_pixmap_(Fl_Image* pixmap); // platform-independent, support function @@ -129,7 +129,6 @@ public: Fl_Region region; Fl_X *next; // chain of mapped windows int wait_for_expose; - NSCursor *cursor; static Fl_X* first; static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;} static int fake_X_wm(const Fl_Window*,int&,int&,int&,int&,int&); @@ -153,8 +152,6 @@ public: static void GL_cleardrawable(void); void destroy(void); void set_key_window(void); - int set_cursor(Fl_Cursor); - int set_cursor(const Fl_RGB_Image*, int, int); static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h); static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel); private: diff --git a/FL/win32.H b/FL/win32.H index 6a4ed57ec..518d2ef78 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -56,8 +56,6 @@ public: Fl_X *next; int wait_for_expose; HDC private_dc; // used for OpenGL - HCURSOR cursor; - int custom_cursor; HDC saved_hdc; // saves the handle of the DC currently loaded // static variables, static functions and member functions static Fl_X* first; @@ -67,8 +65,6 @@ public: void make_fullscreen(int X, int Y, int W, int H); void set_minmax(LPMINMAXINFO minmax); void mapraise(); - int set_cursor(Fl_Cursor); - int set_cursor(const Fl_RGB_Image*, int, int); static Fl_X* make(Fl_Window*); }; extern FL_EXPORT UINT fl_wake_msg; @@ -120,8 +120,6 @@ public: char wait_for_expose; static Fl_X* first; static Fl_X* i(const Fl_Window* wi) {return wi->i;} - int set_cursor(Fl_Cursor); - int set_cursor(const Fl_RGB_Image*, int, int); static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap); static Fl_X* set_xid(Fl_Window*, Window); }; |