diff options
| author | peter.spjuth@gmail.com <pspjuth> | 2002-06-20 21:18:32 (GMT) |
|---|---|---|
| committer | peter.spjuth@gmail.com <pspjuth> | 2002-06-20 21:18:32 (GMT) |
| commit | b4f8756c918eb2fefd2873eff8a37f6ff05166fc (patch) | |
| tree | 4f71ab9042c4b871db2adbb6618a4f29d517ea79 | |
| parent | 2708d96b256c61b91f6c590ba5e5441e7eeadfc7 (diff) | |
| download | tk-b4f8756c918eb2fefd2873eff8a37f6ff05166fc.zip tk-b4f8756c918eb2fefd2873eff8a37f6ff05166fc.tar.gz tk-b4f8756c918eb2fefd2873eff8a37f6ff05166fc.tar.bz2 | |
Corrected the test for grid propagate change. [Bug #571433]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tkGrid.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2002-06-20 Peter Spjuth <peter.spjuth@space.se> + + * generic/tkGrid.c: Corrected the test for grid propagate change. + [Bug #571433] + 2002-06-19 Jeff Hobbs <jeffh@ActiveState.com> * tests/panedwindow.test: diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 48db44e..21a8e56 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGrid.c,v 1.21 2002/06/14 22:25:12 jenglish Exp $ + * RCS: @(#) $Id: tkGrid.c,v 1.22 2002/06/20 21:18:32 pspjuth Exp $ */ #include "tkInt.h" @@ -767,7 +767,7 @@ GridPropagateCommand(tkwin, interp, objc, objv) { Tk_Window master; Gridder *masterPtr; - int propagate; + int propagate, old; if (objc > 4) { Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?"); @@ -789,7 +789,8 @@ GridPropagateCommand(tkwin, interp, objc, objv) /* Only request a relayout if the propagation bit changes */ - if ((!propagate) ^ (masterPtr->flags&DONT_PROPAGATE)) { + old = !(masterPtr->flags & DONT_PROPAGATE); + if (propagate != old) { if (propagate) { masterPtr->flags &= ~DONT_PROPAGATE; } else { |