Skip to content

Commit

Permalink
Doc for arg to Fl_Window::icon(arg) changed to match actual prototype.
Browse files Browse the repository at this point in the history
(char* -> const void*)

Noticed this because docs for this method under OS issues 
wasn't showing up with html highlights.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
  • Loading branch information
erco77 committed Oct 31, 2010
1 parent f52f1c6 commit e811ef7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions documentation/src/osissues.dox
Expand Up @@ -371,7 +371,7 @@ MyWindow::~MyWindow() {
FLTK currently supports setting a window's icon \b before it
is shown using the Fl_Window::icon() method.

void Fl_Window::icon(char *)
void Fl_Window::icon(const void *)

\par
Sets the icon for the window to the passed pointer. You will
Expand All @@ -386,7 +386,7 @@ fl_open_display(); // needed if display has not been previously opened
Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
icon_bits, icon_width, icon_height);

window->icon((char *)p);
window->icon((const void*)p);
\endcode

\par
Expand All @@ -403,7 +403,7 @@ Pixmap p, mask;
XpmCreatePixmapFromData(fl_display, DefaultRootWindow(fl_display),
icon_xpm, &p, &mask, NULL);

window->icon((char *)p);
window->icon((const void *)p);
\endcode

\par
Expand Down Expand Up @@ -552,15 +552,15 @@ to get the window's size or position.
FLTK currently supports setting a window's icon *before* it
is shown using the Fl_Window::icon() method.

void Fl_Window::icon(char *)
void Fl_Window::icon(const void *)

\par
Sets the icon for the window to the passed pointer. You will
need to cast the \c HICON handle to a \c char* when
calling this method. To set the icon using an icon resource
compiled with your application use:
\code
window->icon((char *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
window->icon((const void *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
\endcode

\par
Expand Down

0 comments on commit e811ef7

Please sign in to comment.