summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2007-03-09 00:46:15 (GMT)
committerjenglish <jenglish@flightlab.com>2007-03-09 00:46:15 (GMT)
commit44bc3e12acfd6ccb492f90a574ab9bf722ad2d11 (patch)
tree526110b284d162728fef5fd47773dccd2d15e636
parent30ada06cf24bb0fc3068732d09f95ba6b706073d (diff)
downloadtk-44bc3e12acfd6ccb492f90a574ab9bf722ad2d11.zip
tk-44bc3e12acfd6ccb492f90a574ab9bf722ad2d11.tar.gz
tk-44bc3e12acfd6ccb492f90a574ab9bf722ad2d11.tar.bz2
*Correct* fix for #1676770:
reset wm geometry . and pack propagate . at end of test.
-rw-r--r--ChangeLog5
-rw-r--r--tests/grid.test4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index da7b067..517ca82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
2007-03-08 Joe English <jenglish@users.sourceforge.net>
- * tests/grid.test(grid-21.7): Remove 'pack propagate . 0' call,
- which was causing cascading failures in subsequent tests [Bug 1676770].
+ * tests/grid.test(grid-21.7): Reset wm geometry . and pack propagate .
+ at end of test. 'pack propagate . 0' was causing cascading failures in
+ subsequent tests [Bug 1676770].
2007-03-07 Daniel Steffen <das@users.sourceforge.net>
diff --git a/tests/grid.test b/tests/grid.test
index 6d6af85..d6e3e88 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,7 +5,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: grid.test,v 1.30 2007/03/08 20:30:47 jenglish Exp $
+# RCS: @(#) $Id: grid.test,v 1.31 2007/03/09 00:46:17 jenglish Exp $
package require tcltest 2.1
eval tcltest::configure $argv
@@ -1935,6 +1935,7 @@ test grid-21.7 {anchor} {
frame .$i -bg gray -width 75 -height 50 -bd 2 -relief ridge
grid .$i -in .f -row $i -column $i -sticky nswe
}
+ pack propagate . 0
grid propagate .f 0
. configure -width 300 -height 250
@@ -1944,6 +1945,7 @@ test grid-21.7 {anchor} {
update
lappend res [grid bbox .f]
}
+ pack propagate . 1 ; wm geometry . {}
set res
} [list {37 20 225 150} {75 20 225 150} {75 60 225 150} {75 100 225 150} \
{37 100 225 150} {0 100 225 150} {0 60 225 150} {0 20 225 150} \