summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-04-10 09:25:33 (GMT)
committerdas <das>2006-04-10 09:25:33 (GMT)
commit0a73e78a76039cd51db98aaa1d9b33cfb092fca4 (patch)
tree827246d00e20a4f69c6c3576a00db224eae2f0d8
parent64a92e64f1c435bd787e401721f839472c5d7611 (diff)
downloadtk-0a73e78a76039cd51db98aaa1d9b33cfb092fca4.zip
tk-0a73e78a76039cd51db98aaa1d9b33cfb092fca4.tar.gz
tk-0a73e78a76039cd51db98aaa1d9b33cfb092fca4.tar.bz2
* macosx/tkMacOSXWm.c (TkSetWMName, TkMacOSXMakeRealWindowExist):
allow empty name for toplevels, remove bogus initial window name. [Bug 1450800]
-rw-r--r--ChangeLog2
-rw-r--r--macosx/tkMacOSXWm.c23
2 files changed, 10 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d13dc0..87bac7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* macosx/tkMacOSXWm.c (WmResizableCmd): propagate window attribute
changes to Carbon window manager. [FR 1467004]
+ (TkSetWMName, TkMacOSXMakeRealWindowExist): allow empty name for
+ toplevels, remove bogus initial window name. [Bug 1450800]
2006-04-07 Daniel Steffen <das@users.sourceforge.net>
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 9034946..1591e2a 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXWm.c,v 1.27 2006/04/09 22:07:21 das Exp $
+ * RCS: @(#) $Id: tkMacOSXWm.c,v 1.28 2006/04/10 09:25:34 das Exp $
*/
#include "tkMacOSXInt.h"
@@ -4587,19 +4587,12 @@ TkSetWMName(
return;
}
- if (strlen(titleUid) > 0) {
- title = CFStringCreateWithBytes(NULL, (unsigned char*) titleUid, strlen(titleUid),
- kCFStringEncodingUTF8, false);
- } else {
- title = NULL;
- }
-
- macWin = GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window));
-
- SetWindowTitleWithCFString(macWin, title);
-
- if (title != NULL) {
- CFRelease(title);
+ title = CFStringCreateWithBytes(NULL, (unsigned char*) titleUid,
+ strlen(titleUid), kCFStringEncodingUTF8, false);
+ if (title) {
+ macWin = GetWindowFromPort(TkMacOSXGetDrawablePort(winPtr->window));
+ SetWindowTitleWithCFString(macWin, title);
+ CFRelease(title);
}
}
@@ -5129,7 +5122,7 @@ TkMacOSXMakeRealWindowExist(
}
} else {
- newWindow = NewCWindow(NULL, &geometry, "\ptemp", false,
+ newWindow = NewCWindow(NULL, &geometry, "\p", false,
(short) wmPtr->style, (WindowRef) -1, true, 0);
}