summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2009-09-18 22:35:00 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2009-09-18 22:35:00 (GMT)
commitedff204f863b5527369a1ca046d40240fe45754d (patch)
tree9ddd43380dafb315f6433dbdd5f411d9fa1d7f79 /generic
parent33e2ffcd22e3a6489550d76769c30cdaf2855466 (diff)
downloadtk-edff204f863b5527369a1ca046d40240fe45754d.zip
tk-edff204f863b5527369a1ca046d40240fe45754d.tar.gz
tk-edff204f863b5527369a1ca046d40240fe45754d.tar.bz2
Bug fix in grid/pack collision detect.
Faulty slave was not properly blocked from slave list. [Bug 2859912]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkGrid.c3
-rw-r--r--generic/tkPack.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 6dbe9a3..2ea78c0 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.53 2009/08/19 23:02:00 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.54 2009/09/18 22:35:00 pspjuth Exp $
*/
#include "tkInt.h"
@@ -3293,6 +3293,7 @@ ConfigureSlaves(
if (TkSetGeometryMaster(interp, masterPtr->tkwin, "grid")
!= TCL_OK) {
Tk_ManageGeometry(slave, NULL, NULL);
+ Unlink(slavePtr);
return TCL_ERROR;
}
masterPtr->flags |= ALLOCED_MASTER;
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;