diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-02-25 08:44:47 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2011-02-25 08:44:47 +0000 |
| commit | 94e5f2e1fc5b9e6113e58c4bc494370e802f9783 (patch) | |
| tree | 4c85b926be37efd7db6dab0ca19a95b814cd05db /FL | |
| parent | 27987c6ee00273948920015c1da851f150279154 (diff) | |
Un-inlined Fl_Window::icon() methods to make them easier to extend w/o
breaking the ABI. See discussion in STR #2563.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Window.H | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 01efa160f..1390f173e 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -323,17 +323,15 @@ public: /** Sets the icon label. */ void iconlabel(const char*); /** Sets the icon label. */ - void label(const char* label, const char* iconlabel); // platform dependent + void label(const char* label, const char* iconlabel); // platform dependent void copy_label(const char* a); static void default_xclass(const char*); static const char *default_xclass(); const char* xclass() const; void xclass(const char* c); - /** Gets the current icon window target dependent data. */ - const void* icon() const {return icon_;} - /** Sets the current icon window target dependent data. */ - void icon(const void * ic) {icon_ = ic;} + const void* icon() const; + void icon(const void * ic); /** Returns non-zero if show() has been called (but not hide() @@ -343,11 +341,11 @@ public: int shown() {return i != 0;} /** Puts the window on the screen. Usually (on X) this has the side - effect of opening the display. + effect of opening the display. If the window is already shown then it is restored and raised to the top. This is really convenient because your program can call show() - at any time, even if the window is already up. It also means that + at any time, even if the window is already up. It also means that show() serves the purpose of raise() in other toolkits. Fl_Window::show(int argc, char **argv) is used for top-level |