unix/tkUnixWm.c: Sync with CVS HEAD (r1.47):

Fixes: #959973 "wm title bug" (support Unicode titles)
Fixes: #742882 "Potential division by zero in gridded wm geometry"
Use Tcl_GetTime instead of TclpGetTime [#874745]
Use Tcl_Panic() instead of "panic" [#865264]
Fixes: #632816 "cannot remove transient"
Fixes: #568861 "Fix for wm minsize and maxsize commands"

tests/unixWm.test, tests/wm.test: Updated test suite for
#632816 (unixWm-37.3, unixWm-37.4, wm-grid-1.11, wm-grid-1.12)
and #742882 (unixWm-20.9, unixWm-20.11).


FossilOrigin-Name: aec60b8d64923316e440ae1d95e89443eb9162e2

2 files changed, 8 insertions, 8 deletions

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 2985d65..bca1f5e 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: unixWm.test,v 1.29.2.3 2004/10/05 22:27:27 hobbs Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.29.2.4 2005/01/14 21:09:47 jenglish Exp $
 
 package require tcltest 2.2
 namespace import -force tcltest::configure
@@ -733,13 +733,13 @@ test unixWm-20.8 {Tk_WmCmd procedure, "grid" option} unix {
 } {1 {expected integer but got "bar"}}
 test unixWm-20.9 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 -2 13} msg] $msg
-} {1 {widthInc can't be < 0}}
+} {1 {widthInc can't be <= 0}}
 test unixWm-20.10 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 12 bogus} msg] $msg
 } {1 {expected integer but got "bogus"}}
 test unixWm-20.11 {Tk_WmCmd procedure, "grid" option} unix {
     list [catch {wm grid .t 10 11 12 -1} msg] $msg
-} {1 {heightInc can't be < 0}}
+} {1 {heightInc can't be <= 0}}
 
 catch {destroy .t}
 catch {destroy .icon}
@@ -1232,7 +1232,7 @@ test unixWm-37.3 {Tk_WmCmd procedure, "transient" option} {unix testwrapper} {
 	    [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
     destroy .t2
     set result
-} {{} {} .t 0 {} 0x0}
+} {{} {} .t 0 {} {}}
 test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unix testwrapper} {
     catch {destroy .t2}
     toplevel .t2
@@ -1243,7 +1243,7 @@ test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {uni
     destroy .t3
     update
     list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
-} {{} 0x0}
+} {{} {}}
 test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unix testwrapper} {
     catch {destroy .t2}
     catch {destroy .t3}
diff --git a/tests/wm.test b/tests/wm.test
index 215f4df..60462e8 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: wm.test,v 1.21.2.3 2004/10/29 22:34:06 mdejong Exp $
+# RCS: @(#) $Id: wm.test,v 1.21.2.4 2005/01/14 21:09:48 jenglish Exp $
 
 # This file tests window manager interactions that work across
 # platforms. Window manager tests that only work on a specific
@@ -404,11 +404,11 @@ test wm-grid-1.10 {usage} {
 
 test wm-grid-1.11 {usage} {
     list [catch {wm grid . 13 14 -1 16} msg] $msg
-} {1 {widthInc can't be < 0}}
+} {1 {widthInc can't be <= 0}}
 
 test wm-grid-1.12 {usage} {
     list [catch {wm grid . 13 14 15 -1} msg] $msg
-} {1 {heightInc can't be < 0}}
+} {1 {heightInc can't be <= 0}}
 
 test wm-grid-2.1 {setting and reading values} {
     set result {}