diff options
| author | Manolo Gouy <Manolo> | 2016-03-22 13:27:22 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-22 13:27:22 +0000 |
| commit | 6302b3da00f8116e1bf62629c6d3ab0f719d1a33 (patch) | |
| tree | da164eb125131ccefcbcbd1010e70db09a3ae132 /src/Fl_x.cxx | |
| parent | b8e6c430e8bb1b4cec2f309f2835d7b81240749a (diff) | |
Move all icon-support data to the platform-specific Fl_XXX_Window_Driver class
because these data are platform-specific.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11399 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 ec8361d1b..2e3d49183 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2533,8 +2533,8 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap) fl_show_iconic = 0; showit = 0; } - if (win->pWindowDriver->icon_->legacy_icon) { - hints->icon_pixmap = (Pixmap)win->pWindowDriver->icon_->legacy_icon; + if (((Fl_X11_Window_Driver*)win->pWindowDriver)->icon_->legacy_icon) { + hints->icon_pixmap = (Pixmap)((Fl_X11_Window_Driver*)win->pWindowDriver)->icon_->legacy_icon; hints->flags |= IconPixmapHint; } XSetWMHints(fl_display, xp->xid, hints); @@ -2730,8 +2730,8 @@ void Fl_X::set_icons() { unsigned long *net_wm_icons; size_t net_wm_icons_size; - if (w->pWindowDriver->icon_->count) { - icons_to_property((const Fl_RGB_Image **)w->pWindowDriver->icon_->icons, w->pWindowDriver->icon_->count, + if (((Fl_X11_Window_Driver*)w->pWindowDriver)->icon_->count) { + icons_to_property((const Fl_RGB_Image **)((Fl_X11_Window_Driver*)w->pWindowDriver)->icon_->icons, ((Fl_X11_Window_Driver*)w->pWindowDriver)->icon_->count, &net_wm_icons, &net_wm_icons_size); } else { net_wm_icons = default_net_wm_icons; @@ -2741,7 +2741,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->pWindowDriver->icon_->count) { + if (((Fl_X11_Window_Driver*)w->pWindowDriver)->icon_->count) { delete [] net_wm_icons; net_wm_icons = 0L; net_wm_icons_size = 0; |