summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorhobbs <hobbs>2002-09-30 18:55:56 (GMT)
committerhobbs <hobbs>2002-09-30 18:55:56 (GMT)
commit1b44ccbe9877edeec3d8ff1513bff67bea09fa6e (patch)
treec2a0a6a14219ebcd64bd64480e7cb91f1d0d6586 /generic
parentb4824bcca26ab41c141dc900cf409f7ef8084ae5 (diff)
downloadtk-1b44ccbe9877edeec3d8ff1513bff67bea09fa6e.zip
tk-1b44ccbe9877edeec3d8ff1513bff67bea09fa6e.tar.gz
tk-1b44ccbe9877edeec3d8ff1513bff67bea09fa6e.tar.bz2
* tests/panedwindow.test: added panedwindow-28.[12]
* generic/tkPanedWindow.c (PanedWindowCmdDeletedProc): (Tk_PanedWindowObjCmd): when destroying the panedwindow, destroy the proxy before the parent to avoid dependency conflicts. [Bug #616589]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkPanedWindow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 1f5f83c..c419847 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.8 2002/08/08 01:43:31 hobbs Exp $
+ * RCS: @(#) $Id: tkPanedWindow.c,v 1.9 2002/09/30 18:55:57 hobbs Exp $
*/
#include "tkPort.h"
@@ -418,8 +418,8 @@ Tk_PanedWindowObjCmd(clientData, interp, objc, objv)
(ClientData) pwPtr);
if (ConfigurePanedWindow(interp, pwPtr, objc - 2, objv + 2) != TCL_OK) {
- Tk_DestroyWindow(pwPtr->tkwin);
Tk_DestroyWindow(pwPtr->proxywin);
+ Tk_DestroyWindow(pwPtr->tkwin);
ckfree((char *) pwPtr);
return TCL_ERROR;
}
@@ -1309,8 +1309,8 @@ PanedWindowCmdDeletedProc(clientData)
*/
if (!(pwPtr->flags & WIDGET_DELETED)) {
- Tk_DestroyWindow(pwPtr->tkwin);
Tk_DestroyWindow(pwPtr->proxywin);
+ Tk_DestroyWindow(pwPtr->tkwin);
}
}