diff options
| author | stanton <stanton> | 1999-01-29 00:34:29 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-01-29 00:34:29 (GMT) |
| commit | 998addcce72a803065cfee27b0b2766989d01499 (patch) | |
| tree | 8662f91294e6050caa6af79fd634480c5a1eab4d /generic | |
| parent | 89aede68cdad0d2c46f898878aaeb6938693dc7b (diff) | |
| download | tk-998addcce72a803065cfee27b0b2766989d01499.zip tk-998addcce72a803065cfee27b0b2766989d01499.tar.gz tk-998addcce72a803065cfee27b0b2766989d01499.tar.bz2 | |
Merged changes from Tk 8.0.5b1
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tk.h | 3 | ||||
| -rw-r--r-- | generic/tkGrid.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/generic/tk.h b/generic/tk.h index 68d2369..04aa2f6 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -7,11 +7,12 @@ * Copyright (c) 1989-1994 The Regents of the University of California. * Copyright (c) 1994 The Australian National University. * Copyright (c) 1994-1998 Sun Microsystems, Inc. + * Copyright (c) 1998-1999 Scriptics Corporation. * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.1.4.5 1999/01/07 02:42:48 lfb Exp $ + * RCS: @(#) $Id: tk.h,v 1.1.4.6 1999/01/29 00:34:31 stanton Exp $ */ #ifndef _TK diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 5184dd0..e096896 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.1.4.3 1998/12/13 08:16:06 lfb Exp $ + * RCS: @(#) $Id: tkGrid.c,v 1.1.4.4 1999/01/29 00:34:31 stanton Exp $ */ #include "tkInt.h" @@ -434,6 +434,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; } |