diff options
| author | das <das> | 2006-04-10 09:25:40 (GMT) |
|---|---|---|
| committer | das <das> | 2006-04-10 09:25:40 (GMT) |
| commit | f2091002dfe3ed928a4f02723d19c607bcd86f59 (patch) | |
| tree | 0ff8927df048ffc7cab6f98c941c42ca6f277daa /macosx/tkMacOSXWm.c | |
| parent | 2e64a2f86354deff7f9f04274d781fdd05ab6a55 (diff) | |
| download | tk-f2091002dfe3ed928a4f02723d19c607bcd86f59.zip tk-f2091002dfe3ed928a4f02723d19c607bcd86f59.tar.gz tk-f2091002dfe3ed928a4f02723d19c607bcd86f59.tar.bz2 | |
* macosx/tkMacOSXWm.c (TkSetWMName, TkMacOSXMakeRealWindowExist):
allow empty name for toplevels, remove bogus initial window name.
[Bug 1450800]
Diffstat (limited to 'macosx/tkMacOSXWm.c')
| -rw-r--r-- | macosx/tkMacOSXWm.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index bd0201e..ff4e64e 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.7.2.21 2006/04/09 22:07:27 das Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.7.2.22 2006/04/10 09:25:42 das Exp $ */ #include "tkMacOSXInt.h" @@ -4486,19 +4486,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); } } @@ -5028,7 +5021,7 @@ TkMacOSXMakeRealWindowExist( } } else { - newWindow = NewCWindow(NULL, &geometry, "\ptemp", false, + newWindow = NewCWindow(NULL, &geometry, "\p", false, (short) wmPtr->style, (WindowRef) -1, true, 0); } |