Author: manolo
Date: 2011-05-15 02:42:36 -0700 (Sun, 15 May 2011)
New Revision: 8664
Log:
Mac OS: implemented the effect of the 2nd arg of Fl_Window::label(label,
iconlabel)
that sets the window name when it is iconized (or minimized).
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2011-05-15 07:59:01 UTC (rev 8663)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2011-05-15 09:42:36 UTC (rev 8664)
@@ -2209,13 +2209,21 @@
/*
- * set the window title bar
- * \todo make the titlebar icon work!
+ * set the window title bar name
*/
-void Fl_Window::label(const char *name,const char */*iname*/) {
+void Fl_Window::label(const char *name, const char *mininame) {
Fl_Widget::label(name);
+ iconlabel_ = mininame;
if (shown() || i) {
- q_set_window_title((NSWindow*)i->xid, name);
+ NSWindow* nsw = (NSWindow*)i->xid;
+ q_set_window_title(nsw, name);
+ if (mininame && strlen(mininame)) {
+ CFStringRef minititle = CFStringCreateWithCString(NULL, mininame,
kCFStringEncodingUTF8);
+ if (minititle) {
+ [nsw setMiniwindowTitle:(NSString*)minititle];
+ CFRelease(minititle);
+ }
+ }
}
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
