diff options
| author | pspjuth <pspjuth@noemail.net> | 2009-09-18 22:34:59 (GMT) |
|---|---|---|
| committer | pspjuth <pspjuth@noemail.net> | 2009-09-18 22:34:59 (GMT) |
| commit | 59cac4b3c46f93f1e6a6bfa9ffb66e064fec062f (patch) | |
| tree | 9ddd43380dafb315f6433dbdd5f411d9fa1d7f79 /generic/tkPack.c | |
| parent | a0ab2a5726d3f5a4bd62e047e66d070e18585994 (diff) | |
| download | tk-59cac4b3c46f93f1e6a6bfa9ffb66e064fec062f.zip tk-59cac4b3c46f93f1e6a6bfa9ffb66e064fec062f.tar.gz tk-59cac4b3c46f93f1e6a6bfa9ffb66e064fec062f.tar.bz2 | |
Bug fix in grid/pack collision detect.
Faulty slave was not properly blocked from slave list. [Bug 2859912]
FossilOrigin-Name: d063f43d92bd3972a22e6eb751e0ebc2cc38b2a9
Diffstat (limited to 'generic/tkPack.c')
| -rw-r--r-- | generic/tkPack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkPack.c b/generic/tkPack.c index c113e6f..d57d2bf 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPack.c,v 1.34 2009/08/19 23:02:00 pspjuth Exp $ + * RCS: @(#) $Id: tkPack.c,v 1.35 2009/09/18 22:35:00 pspjuth Exp $ */ #include "tkInt.h" @@ -1261,6 +1261,7 @@ PackAfter( if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack") != TCL_OK) { Tk_ManageGeometry(tkwin, NULL, NULL); + Unlink(packPtr); return TCL_ERROR; } masterPtr->flags |= ALLOCED_MASTER; @@ -1793,6 +1794,7 @@ ConfigureSlaves( if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack") != TCL_OK) { Tk_ManageGeometry(slave, NULL, NULL); + Unlink(slavePtr); return TCL_ERROR; } masterPtr->flags |= ALLOCED_MASTER; |