diff options
| author | Manolo Gouy <Manolo> | 2016-04-16 13:15:49 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-04-16 13:15:49 +0000 |
| commit | c4953935b07bd0aad7ebf1a4762c9335ff3f9a0d (patch) | |
| tree | 3095203c3468714c13b33cd18a164492e54bbb37 /FL | |
| parent | b0ce80f56bc0ff464277910cf0340a3162864498 (diff) | |
Continue removing non window-related member-functions from class Fl_X.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11633 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window_Driver.H | 1 | ||||
| -rw-r--r-- | FL/mac.H | 2 | ||||
| -rw-r--r-- | FL/win32.H | 1 | ||||
| -rw-r--r-- | FL/x.H | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index d2d485a52..d701783f3 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -145,6 +145,7 @@ public: virtual const void *icon() const {return NULL;} // TODO: check virtual void icon(const void * ic) {} // TODO: check virtual void free_icons() {} // TODO: check + virtual void set_icons() {} // each platform implements this its own way static void default_icons(const Fl_RGB_Image *icons[], int count); @@ -157,8 +157,6 @@ public: static void GL_cleardrawable(void); void destroy(void); void set_key_window(void); - // OS X doesn't have per window icons - void set_icons() {}; 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); diff --git a/FL/win32.H b/FL/win32.H index 8b841886b..95d3a2bb1 100644 --- a/FL/win32.H +++ b/FL/win32.H @@ -70,7 +70,6 @@ public: void flush() {w->flush();} void set_minmax(LPMINMAXINFO minmax); void mapraise(); - void set_icons(); int set_cursor(Fl_Cursor); int set_cursor(const Fl_RGB_Image*, int, int); static Fl_X* make(Fl_Window*); @@ -125,7 +125,6 @@ public: static Fl_X* i(const Fl_Window* wi) {return wi->i;} void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} void sendxjunk(); - void set_icons(); 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); |
