diff options
| -rw-r--r-- | documentation/src/osissues.dox | 8 | ||||
| -rw-r--r-- | src/Fl_Window.cxx | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/documentation/src/osissues.dox b/documentation/src/osissues.dox index 2c9a08ac0..0d4429a10 100644 --- a/documentation/src/osissues.dox +++ b/documentation/src/osissues.dox @@ -990,6 +990,7 @@ and with the \c FLTK_SCALING_FACTOR environment variable. \subsection osissues_wayland_window_icon Window icons Standard FLTK functions Fl_Window::icon(const Fl_RGB_Image*), +Fl_Window::icons(const Fl_RGB_Image*[], int), Fl_Window::default_icon(const Fl_RGB_Image*) and Fl_Window::default_icons(const Fl_RGB_Image*[], int) have no effect on the Wayland platform. @@ -1007,9 +1008,10 @@ Exec=editor %%F Icon=/path/to/icon/file/editor.svg MimeType=text/plain </pre> -- The Name= line therein determines the string displayed when the app runs. -- One or more Name[<em>locale</em>]= lines can be used to set locale-specific app names. -- The Icon= line accepts also \c .png files. +- The \c Name= line therein determines the string displayed when the app runs. +- Optionally, one or more <tt>Name[<em>locale</em>]=</tt> lines can be used to set +locale-specific app names. +- The \c Icon= line accepts also \c .png files. - put this file in \c /usr/local/share/applications/ so its available to all system users or in <tt>$HOME/.local/share/applications/</tt> so its available to a single user. diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index b594a8cd7..56f672f44 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -291,6 +291,7 @@ const char *Fl_Window::xclass() const \see Fl_Window::default_icons(const Fl_RGB_Image *[], int) \see Fl_Window::icon(const Fl_RGB_Image *) \see Fl_Window::icons(const Fl_RGB_Image *[], int) + \note See \ref osissues_wayland_window_icon for the Wayland platform. */ void Fl_Window::default_icon(const Fl_RGB_Image *icon) { if (icon) @@ -316,6 +317,7 @@ void Fl_Window::default_icon(const Fl_RGB_Image *icon) { \see Fl_Window::default_icon(const Fl_RGB_Image *) \see Fl_Window::icon(const Fl_RGB_Image *) \see Fl_Window::icons(const Fl_RGB_Image *[], int) + \note See \ref osissues_wayland_window_icon for the Wayland platform. */ void Fl_Window::default_icons(const Fl_RGB_Image *icons[], int count) { Fl::screen_driver()->open_display(); @@ -341,6 +343,7 @@ void Fl_Window::default_icons(const Fl_RGB_Image *icons[], int count) { \see Fl_Window::default_icon(const Fl_RGB_Image *) \see Fl_Window::default_icons(const Fl_RGB_Image *[], int) \see Fl_Window::icons(const Fl_RGB_Image *[], int) + \note See \ref osissues_wayland_window_icon for the Wayland platform. */ void Fl_Window::icon(const Fl_RGB_Image *icon) { if (icon) @@ -369,6 +372,7 @@ void Fl_Window::icon(const Fl_RGB_Image *icon) { \see Fl_Window::default_icon(const Fl_RGB_Image *) \see Fl_Window::default_icons(const Fl_RGB_Image *[], int) \see Fl_Window::icon(const Fl_RGB_Image *) + \note See \ref osissues_wayland_window_icon for the Wayland platform. */ void Fl_Window::icons(const Fl_RGB_Image *icons[], int count) { pWindowDriver->icons(icons, count); |