diff options
| author | Manolo Gouy <Manolo> | 2016-03-24 06:19:10 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-24 06:19:10 +0000 |
| commit | 1778ee8831c00599b31390b61e687bd6b06bcb19 (patch) | |
| tree | 42a53f4eddca1ac923f67130d2e9f1960767a5e5 /src | |
| parent | 6e141d14dfe367098d233a99d55221f357cbb684 (diff) | |
Fix the implementation of Fl_Window::default_icons(const Fl_RGB_Image *icons[], int count) under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11417 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Window.cxx | 3 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_x.cxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 05b8a8470..ef9669973 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -21,7 +21,6 @@ // crap you need to do to communicate with X is in Fl_x.cxx, the // equivalent (but totally different) crap for MSWindows is in Fl_win32.cxx #include <FL/Fl.H> -#include <FL/x.H> #include <FL/Fl_Window_Driver.H> #include <FL/Fl_RGB_Image.H> #include <FL/Fl_Window.H> @@ -310,7 +309,7 @@ void Fl_Window::default_icon(const Fl_RGB_Image *icon) { \see Fl_Window::icons(const Fl_RGB_Image *[], int) */ void Fl_Window::default_icons(const Fl_RGB_Image *icons[], int count) { - Fl_X::set_default_icons(icons, count); + Fl_Window_Driver::default_icons(icons, count); } /** Sets a single window icon. diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 28d8b4b3b..3806a2e52 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -158,6 +158,8 @@ void fl_set_status(int x, int y, int w, int h) { } +void Fl_Window_Driver::default_icons(const Fl_RGB_Image *icons[], int count) {} + /* * Mac keyboard lookup table */ diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index be2067ba1..ef6cefff9 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -2030,7 +2030,7 @@ static const Fl_RGB_Image *find_best_icon(int ideal_width, return best; } -void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) { +void Fl_Window_Driver::default_icons(const Fl_RGB_Image *icons[], int count) { const Fl_RGB_Image *best_big, *best_small; if (default_big_icon != NULL) diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 26a399f1f..068588471 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2708,7 +2708,7 @@ static void icons_to_property(const Fl_RGB_Image *icons[], int count, } } -void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) { +void Fl_Window_Driver::default_icons(const Fl_RGB_Image *icons[], int count) { if (default_net_wm_icons) { delete [] default_net_wm_icons; default_net_wm_icons = 0L; |