diff options
| author | Manolo Gouy <Manolo> | 2016-03-10 22:26:40 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-10 22:26:40 +0000 |
| commit | 31fcd84ca990ded6b96f0e3a82adc3f38d0cdb2c (patch) | |
| tree | 13212ec1fa76ebbfb144b831df6edd669acf5d69 /src/Fl_x.cxx | |
| parent | 7098924b82110cf468d3cbdc4742bd9a2632296d (diff) | |
Rewrite all window icon-related Fl_Window API with the window driver approach.
It seems this allows not to #include <windows.h> in the public header files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index cd3a70f6c..82af113b7 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2531,8 +2531,8 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) fl_show_iconic = 0; showit = 0; } - if (win->icon_->legacy_icon) { - hints->icon_pixmap = (Pixmap)win->icon_->legacy_icon; + if (win->pWindowDriver->icon_->legacy_icon) { + hints->icon_pixmap = (Pixmap)win->pWindowDriver->icon_->legacy_icon; hints->flags |= IconPixmapHint; } XSetWMHints(fl_display, xp->xid, hints); @@ -2728,8 +2728,8 @@ void Fl_X::set_icons() { unsigned long *net_wm_icons; size_t net_wm_icons_size; - if (w->icon_->count) { - icons_to_property((const Fl_RGB_Image **)w->icon_->icons, w->icon_->count, + if (w->pWindowDriver->icon_->count) { + icons_to_property((const Fl_RGB_Image **)w->pWindowDriver->icon_->icons, w->pWindowDriver->icon_->count, &net_wm_icons, &net_wm_icons_size); } else { net_wm_icons = default_net_wm_icons; @@ -2739,7 +2739,7 @@ void Fl_X::set_icons() { XChangeProperty (fl_display, xid, fl_NET_WM_ICON, XA_CARDINAL, 32, PropModeReplace, (unsigned char*) net_wm_icons, net_wm_icons_size); - if (w->icon_->count) { + if (w->pWindowDriver->icon_->count) { delete [] net_wm_icons; net_wm_icons = 0L; net_wm_icons_size = 0; |