From 904ae0db0f3d48fa1eb3f97d75fb7f79b630ae5c Mon Sep 17 00:00:00 2001 From: hobbs Date: Sat, 22 Jun 2002 09:15:51 +0000 Subject: * generic/tkGrid.c (GridReqProc): check that gridPtr is not NULL (may be when embedded). [Bug #548791] (halliday) --- generic/tkGrid.c | 4 ++-- 1 file 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); } -- cgit v0.12