summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--tests/grid.test13
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 93201ef..7b95157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-17 Eric Melski <ericm@scriptics.com>
+
+ * tests/grid.test: Added test for [grid propagate . 0] to not toggle.
+
+ * generic/tkGrid.c: Fixed bogus logic in [grid propagate] that
+ caused [grid propagate . 0] to act as a toggle instead of an
+ absolute set. [Bug: 2286].
+
2000-04-16 Jeff Hobbs <hobbs@scriptics.com>
* win/tkWinColor.c (FindSystemColor): correct calculation of
diff --git a/tests/grid.test b/tests/grid.test
index d80f1a9..31e49df 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.7 2000/01/20 23:46:21 ericm Exp $
+# RCS: @(#) $Id: grid.test,v 1.8 2000/04/17 17:44:27 ericm Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -370,7 +370,16 @@ test grid-7.6 {propagate} {
set a
} {100x100 100x100 75x85}
grid_reset 7.6
-
+test grid-7.7 {propagate} {
+ grid propagate . 1
+ set res [list [grid propagate .]]
+ grid propagate . 0
+ lappend res [grid propagate .]
+ grid propagate . 0
+ lappend res [grid propagate .]
+ set res
+} [list 1 0 0]
+grid_reset 7.7
test grid-8.1 {size} {
list [catch {grid size . foo} msg] $msg