mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Un-inlined Fl_Window::icon() methods to make them easier to extend w/o

Browse Source 
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
This commit is contained in:
Albrecht Schlosser 2011-02-25 08:44:47 +00:00
parent 27987c6ee0
commit 94e5f2e1fc
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FL/Fl_Window.H
View File

@ -323,17 +323,15 @@ public:
/** Sets the icon label. */ /** Sets the icon label. */
void iconlabel(const char*); void iconlabel(const char*);
/** Sets the icon label. */ /** 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); void copy_label(const char* a);
static void default_xclass(const char*); static void default_xclass(const char*);
static const char *default_xclass(); static const char *default_xclass();
const char* xclass() const; const char* xclass() const;
void xclass(const char* c); void xclass(const char* c);
/** Gets the current icon window target dependent data. */ const void* icon() const;
const void* icon() const {return icon_;} void icon(const void * ic);
/** Sets the current icon window target dependent data. */
void icon(const void * ic) {icon_ = ic;}
/** /**
Returns non-zero if show() has been called (but not hide() Returns non-zero if show() has been called (but not hide()
@ -343,11 +341,11 @@ public:
int shown() {return i != 0;} int shown() {return i != 0;}
/** /**
Puts the window on the screen. Usually (on X) this has the side 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 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() 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. show() serves the purpose of raise() in other toolkits.
Fl_Window::show(int argc, char **argv) is used for top-level Fl_Window::show(int argc, char **argv) is used for top-level

10
src/Fl_Window.cxx
View File

@ -277,6 +277,16 @@ const char *Fl_Window::xclass() const
} }
} }
/** Gets the current icon window target dependent data. */
const void *Fl_Window::icon() const {
return icon_;
}
/** Sets the current icon window target dependent data. */
void Fl_Window::icon(const void * ic) {
icon_ = ic;
}
// //
// End of "$Id$". // End of "$Id$".