diff options
| -rw-r--r-- | FL/Fl_Double_Window.H | 2 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 4 | ||||
| -rw-r--r-- | FL/Fl_Window.H | 14 |
3 files changed, 12 insertions, 8 deletions
diff --git a/FL/Fl_Double_Window.H b/FL/Fl_Double_Window.H index 4ffcb65d1..35085d309 100644 --- a/FL/Fl_Double_Window.H +++ b/FL/Fl_Double_Window.H @@ -23,7 +23,6 @@ #define Fl_Double_Window_H #include "Fl_Window.H" -class Fl_Overlay_Window; /** The Fl_Double_Window provides a double-buffered window. @@ -45,7 +44,6 @@ public: /** Return non-null if this is an Fl_Overlay_Window object. */ - virtual Fl_Overlay_Window *as_overlay_window() {return NULL; } virtual Fl_Double_Window *as_double_window() {return this; } void show(); void show(int a, char **b) {Fl_Window::show(a,b);} diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 0738e6638..fe978f125 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1010,8 +1010,8 @@ public: \see Fl_Widget::as_group(), Fl_Widget::as_window() */ virtual class Fl_Gl_Window* as_gl_window() {return 0;} - - /** Returns non zero if MAC_USE_ACCENTS_MENU flag is set, 0 otherwise. + + /** Returns non zero if MAC_USE_ACCENTS_MENU flag is set, 0 otherwise. */ int use_accents_menu() { return flags() & MAC_USE_ACCENTS_MENU; } diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index c1d47c5a7..3573dbb85 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -544,9 +544,6 @@ public: */ void make_current(); - // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. - virtual Fl_Window* as_window() { return this; } - /** Changes the cursor for this window. This always calls the system, if you are changing the cursor a lot you may want to keep track of how @@ -581,10 +578,19 @@ public: Fl_Window_Driver *driver() { return pWindowDriver; } + // Note: Doxygen docs in Fl_Widget.H to avoid redundancy. + virtual Fl_Window* as_window() { return this; } + + /** + Return non-null if this is an Fl_Overlay_Window object. + */ + virtual class Fl_Overlay_Window *as_overlay_window() {return 0L; } + /** Return non-null if this is an Fl_Double_Window object. */ - virtual Fl_Double_Window *as_double_window() {return NULL;} + virtual class Fl_Double_Window *as_double_window() {return 0L;} + void shape(const Fl_Image* img); void shape(const Fl_Image& b) ; int is_shaped(); |