diff options
author | hobbs <hobbs> | 2004-05-03 19:17:39 (GMT) |
---|---|---|
committer | hobbs <hobbs> | 2004-05-03 19:17:39 (GMT) |
commit | 130b24b09df7ef93ac50cd3416153ea526598903 (patch) | |
tree | d4118a3c330618f886443d5ae8ef3f24bbc7cb45 /generic/tkPanedWindow.c | |
parent | 823b7580b6622f742ca2dc4d42ff0c42dbc7729a (diff) | |
download | tk-130b24b09df7ef93ac50cd3416153ea526598903.zip tk-130b24b09df7ef93ac50cd3416153ea526598903.tar.gz tk-130b24b09df7ef93ac50cd3416153ea526598903.tar.bz2 |
* tests/panedwindow.test: panedwindow-25.1
* generic/tkPanedWindow.c (Unlink): clean up -before/-after refs
to a slave when removing it. [Bug #928413] (griffin)
Diffstat (limited to 'generic/tkPanedWindow.c')
-rw-r--r-- | generic/tkPanedWindow.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index 07000c3..6151dbf 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.4 2003/08/19 21:00:13 jenglish Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.5 2004/05/03 19:17:39 hobbs Exp $ */ #include "tkPort.h" @@ -1748,6 +1748,18 @@ Unlink(slavePtr) } } + /* + * Clean out any -after or -before references to this slave + */ + for (i = 0; i < masterPtr->numSlaves; i++) { + if (masterPtr->slaves[i]->before == slavePtr->tkwin) { + masterPtr->slaves[i]->before = None; + } + if (masterPtr->slaves[i]->after == slavePtr->tkwin) { + masterPtr->slaves[i]->after = None; + } + } + masterPtr->flags |= REQUESTED_RELAYOUT; if (!(masterPtr->flags & REDRAW_PENDING)) { masterPtr->flags |= REDRAW_PENDING; |