diff options
| author | hobbs <hobbs> | 2002-06-22 09:15:51 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-06-22 09:15:51 (GMT) |
| commit | 9e028ef765d52a7db1bbda5eb13989a23b30fdc3 (patch) | |
| tree | 1ddb398f1c54024fed44d0b30c2b46ce70a3b24f /generic/tkGrid.c | |
| parent | 29fcd9fc6057ab5592252be5af5a2481d4704c3f (diff) | |
| download | tk-9e028ef765d52a7db1bbda5eb13989a23b30fdc3.zip tk-9e028ef765d52a7db1bbda5eb13989a23b30fdc3.tar.gz tk-9e028ef765d52a7db1bbda5eb13989a23b30fdc3.tar.bz2 | |
* generic/tkGrid.c (GridReqProc): check that gridPtr is not NULL
(may be when embedded). [Bug #548791] (halliday)
Diffstat (limited to 'generic/tkGrid.c')
| -rw-r--r-- | generic/tkGrid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 21a8e56..9934ec6 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.22 2002/06/20 21:18:32 pspjuth Exp $ + * RCS: @(#) $Id: tkGrid.c,v 1.23 2002/06/22 09:15:51 hobbs Exp $ */ #include "tkInt.h" @@ -1202,7 +1202,7 @@ GridReqProc(clientData, tkwin) register Gridder *gridPtr = (Gridder *) clientData; gridPtr = gridPtr->masterPtr; - if (!(gridPtr->flags & REQUESTED_RELAYOUT)) { + if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) { gridPtr->flags |= REQUESTED_RELAYOUT; Tcl_DoWhenIdle(ArrangeGrid, (ClientData) gridPtr); } |