diff options
| author | Manolo Gouy <Manolo> | 2016-03-23 18:00:37 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-23 18:00:37 +0000 |
| commit | fdaad858ba78ac232df8b5a7d6f1ab3a64680a6c (patch) | |
| tree | 47cf7aaf6cd8622f8ec4253cc209b6fce948ca34 /FL | |
| parent | e3ee1e7b81c9b1a8806b80cd69c66eeccc679bf9 (diff) | |
Rewrite Fl_Window::iconize() under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11411 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window.H | 3 | ||||
| -rw-r--r-- | FL/Fl_Window_Driver.H | 1 | ||||
| -rw-r--r-- | FL/mac.H | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 58165bffe..317c66247 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -22,6 +22,7 @@ #ifndef Fl_Window_H #define Fl_Window_H +#include <FL/Fl.H> #include <FL/Fl_Group.H> #include <FL/Fl_Bitmap.H> #include <stdlib.h> @@ -54,6 +55,7 @@ class Fl_Double_Window; class FL_EXPORT Fl_Window : public Fl_Group { static char *default_xclass_; + static char show_iconic_; // 1 means create next window in iconic form int no_fullscreen_x; int no_fullscreen_y; @@ -64,6 +66,7 @@ class FL_EXPORT Fl_Window : public Fl_Group { int fullscreen_screen_left; int fullscreen_screen_right; + friend int Fl::arg(int argc, char **argv, int &i); friend class Fl_X; friend class Fl_Window_Driver; Fl_X *i; // points at the system-specific stuff, but exists only after the window is mapped diff --git a/FL/Fl_Window_Driver.H b/FL/Fl_Window_Driver.H index cc515e382..4779f4354 100644 --- a/FL/Fl_Window_Driver.H +++ b/FL/Fl_Window_Driver.H @@ -95,6 +95,7 @@ public: virtual void fullscreen_off(int X, int Y, int W, int H) {} virtual void use_border(); virtual void size_range(); + virtual void iconize() {} // --- window shape stuff void shape_pixmap_(Fl_Image* pixmap); // TODO: check @@ -177,7 +177,6 @@ public: static void GLcontext_makecurrent(NSOpenGLContext*); static void GL_cleardrawable(void); void destroy(void); - void collapse(void); WindowRef window_ref(void); // useless with cocoa GL windows void set_key_window(void); // OS X doesn't have per window icons |
