summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorstanton <stanton>1999-01-06 21:10:45 (GMT)
committerstanton <stanton>1999-01-06 21:10:45 (GMT)
commite904bc5e620774bea43638c8cd679affbc36fa2e (patch)
treef3b0b77980dea9353ef24843caa0eacb634e1ffb /generic
parent5519b5f36b63e8e841ed3b31293e5eaaf42dfc47 (diff)
downloadtk-e904bc5e620774bea43638c8cd679affbc36fa2e.zip
tk-e904bc5e620774bea43638c8cd679affbc36fa2e.tar.gz
tk-e904bc5e620774bea43638c8cd679affbc36fa2e.tar.bz2
* generic/tkGrid.c: Fixed bug in "grid forget" that failed to cancelscriptics_tclpro_1_2_b1
pending idle handlers, resulting in a crash in a few odd cases.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkGrid.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 46aa699..ea7a54c 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.2 1998/09/14 18:23:12 stanton Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.3 1999/01/06 21:10:46 stanton Exp $
*/
#include "tkInt.h"
@@ -440,6 +440,9 @@ Tk_GridCmd(clientData, interp, argc, argv)
slavePtr->padX = slavePtr->padY = 0;
slavePtr->iPadX = slavePtr->iPadY = 0;
slavePtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
+ if (slavePtr->flags & REQUESTED_RELAYOUT) {
+ Tk_CancelIdleCall(ArrangeGrid, (ClientData) slavePtr);
+ }
slavePtr->flags = 0;
slavePtr->sticky = 0;
}