From d6c262e7a0218bf88b6632d5c1b68747398d8011 Mon Sep 17 00:00:00 2001 From: pspjuth Date: Thu, 20 Jun 2002 21:18:32 +0000 Subject: Corrected the test for grid propagate change. [Bug #571433] FossilOrigin-Name: 98d6cad79c2e09eae349322c87c6cf57a358505f --- ChangeLog | 5 +++++ generic/tkGrid.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc02abc..302257d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-06-20 Peter Spjuth + + * generic/tkGrid.c: Corrected the test for grid propagate change. + [Bug #571433] + 2002-06-19 Jeff Hobbs * 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 { -- cgit v0.12