mirror of
https://github.com/fltk/fltk.git
synced 2026-06-04 23:42:15 +08:00
Doc for arg to Fl_Window::icon(arg) changed to match actual prototype.
(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
This commit is contained in:
@@ -371,7 +371,7 @@ MyWindow::~MyWindow() {
|
|||||||
FLTK currently supports setting a window's icon \b before it
|
FLTK currently supports setting a window's icon \b before it
|
||||||
is shown using the Fl_Window::icon() method.
|
is shown using the Fl_Window::icon() method.
|
||||||
|
|
||||||
void Fl_Window::icon(char *)
|
void Fl_Window::icon(const void *)
|
||||||
|
|
||||||
\par
|
\par
|
||||||
Sets the icon for the window to the passed pointer. You will
|
Sets the icon for the window to the passed pointer. You will
|
||||||
@@ -386,7 +386,7 @@ fl_open_display(); // needed if display has not been previously opened
|
|||||||
Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
|
Pixmap p = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
|
||||||
icon_bits, icon_width, icon_height);
|
icon_bits, icon_width, icon_height);
|
||||||
|
|
||||||
window->icon((char *)p);
|
window->icon((const void*)p);
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\par
|
\par
|
||||||
@@ -403,7 +403,7 @@ Pixmap p, mask;
|
|||||||
XpmCreatePixmapFromData(fl_display, DefaultRootWindow(fl_display),
|
XpmCreatePixmapFromData(fl_display, DefaultRootWindow(fl_display),
|
||||||
icon_xpm, &p, &mask, NULL);
|
icon_xpm, &p, &mask, NULL);
|
||||||
|
|
||||||
window->icon((char *)p);
|
window->icon((const void *)p);
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\par
|
\par
|
||||||
@@ -552,7 +552,7 @@ to get the window's size or position.
|
|||||||
FLTK currently supports setting a window's icon *before* it
|
FLTK currently supports setting a window's icon *before* it
|
||||||
is shown using the Fl_Window::icon() method.
|
is shown using the Fl_Window::icon() method.
|
||||||
|
|
||||||
void Fl_Window::icon(char *)
|
void Fl_Window::icon(const void *)
|
||||||
|
|
||||||
\par
|
\par
|
||||||
Sets the icon for the window to the passed pointer. You will
|
Sets the icon for the window to the passed pointer. You will
|
||||||
@@ -560,7 +560,7 @@ need to cast the \c HICON handle to a \c char* when
|
|||||||
calling this method. To set the icon using an icon resource
|
calling this method. To set the icon using an icon resource
|
||||||
compiled with your application use:
|
compiled with your application use:
|
||||||
\code
|
\code
|
||||||
window->icon((char *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
|
window->icon((const void *)LoadIcon(fl_display, MAKEINTRESOURCE(IDI_ICON)));
|
||||||
\endcode
|
\endcode
|
||||||
|
|
||||||
\par
|
\par
|
||||||
|
|||||||
Reference in New Issue
Block a user