diff options
| author | Manolo Gouy <Manolo> | 2016-03-21 17:55:10 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-21 17:55:10 +0000 |
| commit | 3f34aba828983bc783529a30c0fa22c55b7abc05 (patch) | |
| tree | 847fd89384088285bafc22e461a507c0d68e8d78 /src/Fl_x.cxx | |
| parent | 9ba3889ae5a7054b4d75c0ccb0f54e16b9b99159 (diff) | |
Rewrite Fl_Window::label(const char *name, const char *mininame) under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11394 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index ce72367cf..ec8361d1b 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -2872,18 +2872,17 @@ const char *fl_filename_name(const char *name) { return q; } -void Fl_Window::label(const char *name,const char *iname) { - Fl_Widget::label(name); - iconlabel_ = iname; - if (shown() && !parent()) { +void Fl_X11_Window_Driver::label(const char *name, const char *iname) { + if (pWindow->shown() && !pWindow->parent()) { if (!name) name = ""; int namelen = strlen(name); if (!iname) iname = fl_filename_name(name); int inamelen = strlen(iname); - XChangeProperty(fl_display, i->xid, fl_NET_WM_NAME, fl_XaUtf8String, 8, 0, (uchar*)name, namelen); // utf8 - XChangeProperty(fl_display, i->xid, XA_WM_NAME, XA_STRING, 8, 0, (uchar*)name, namelen); // non-utf8 - XChangeProperty(fl_display, i->xid, fl_NET_WM_ICON_NAME, fl_XaUtf8String, 8, 0, (uchar*)iname, inamelen); // utf8 - XChangeProperty(fl_display, i->xid, XA_WM_ICON_NAME, XA_STRING, 8, 0, (uchar*)iname, inamelen); // non-utf8 + Window win = fl_xid(pWindow); + XChangeProperty(fl_display, win, fl_NET_WM_NAME, fl_XaUtf8String, 8, 0, (uchar*)name, namelen); // utf8 + XChangeProperty(fl_display, win, XA_WM_NAME, XA_STRING, 8, 0, (uchar*)name, namelen); // non-utf8 + XChangeProperty(fl_display, win, fl_NET_WM_ICON_NAME, fl_XaUtf8String, 8, 0, (uchar*)iname, inamelen); // utf8 + XChangeProperty(fl_display, win, XA_WM_ICON_NAME, XA_STRING, 8, 0, (uchar*)iname, inamelen); // non-utf8 } } |