diff options
| author | pspjuth <peter.spjuth@gmail.com> | 2009-08-19 23:01:59 (GMT) |
|---|---|---|
| committer | pspjuth <peter.spjuth@gmail.com> | 2009-08-19 23:01:59 (GMT) |
| commit | 2b61fda7660e28461b6dfe55f422c70aa390483d (patch) | |
| tree | a4c7c1cd7c558900a4ca247babd4096d872f1f42 /generic/tkWindow.c | |
| parent | f4cf4a95f73b53ac9c0a6e3c93d9676d2877598e (diff) | |
| download | tk-2b61fda7660e28461b6dfe55f422c70aa390483d.zip tk-2b61fda7660e28461b6dfe55f422c70aa390483d.tar.gz tk-2b61fda7660e28461b6dfe55f422c70aa390483d.tar.bz2 | |
Give an error if grid and pack are used in the same master. [Patch 2475855]
Diffstat (limited to 'generic/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 8c2d435..70c8472 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.103 2009/02/27 23:04:39 patthoyts Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.104 2009/08/19 23:02:00 pspjuth Exp $ */ #include "tkInt.h" @@ -709,6 +709,7 @@ TkAllocWindow( winPtr->internalBorderBottom = 0; winPtr->minReqWidth = 0; winPtr->minReqHeight = 0; + winPtr->geometryMaster = NULL; return winPtr; } @@ -1485,6 +1486,10 @@ Tk_DestroyWindow( TkOptionDeadWindow(winPtr); TkSelDeadWindow(winPtr); TkGrabDeadWindow(winPtr); + if (winPtr->geometryMaster != NULL) { + ckfree(winPtr->geometryMaster); + winPtr->geometryMaster = NULL; + } if (winPtr->mainPtr != NULL) { if (winPtr->pathName != NULL) { Tk_DeleteAllBindings(winPtr->mainPtr->bindingTable, |