From 47c7da09ff809aa475def826d7ba6656771fee26 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Mon, 10 Apr 2006 09:25:40 +0000
Subject: 	* macosx/tkMacOSXWm.c (TkSetWMName,
 TkMacOSXMakeRealWindowExist): 	allow empty name for toplevels, remove bogus
 initial window name. 	[Bug 1450800]

---
 ChangeLog           |  2 ++
 macosx/tkMacOSXWm.c | 23 ++++++++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34de79b..3ed9d8c 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 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);
     }
 
-- 
cgit v0.12