summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-11-30 22:58:07 (GMT)
committerhobbs <hobbs>2005-11-30 22:58:07 (GMT)
commitbd774a44a840aacdc897242798453a0de8ba984a (patch)
treeefaa70682910c2805999e866fd447cf69bab006f /win
parent9f0a88811e58296be56492cc3d3ef3486c88ab38 (diff)
downloadtk-bd774a44a840aacdc897242798453a0de8ba984a.zip
tk-bd774a44a840aacdc897242798453a0de8ba984a.tar.gz
tk-bd774a44a840aacdc897242798453a0de8ba984a.tar.bz2
* win/tkWinWm.c (UpdateWrapper): Don't install frame menu on dead
window. Backport of 1233635
Diffstat (limited to 'win')
-rw-r--r--win/tkWinWm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index f5d8f59..52086ef 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.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: tkWinWm.c,v 1.54.2.20 2005/06/01 00:07:30 mdejong Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.54.2.21 2005/11/30 22:58:07 hobbs Exp $
*/
#include "tkWinInt.h"
@@ -2123,7 +2123,9 @@ UpdateWrapper(winPtr)
wmPtr->x = place.rcNormalPosition.left;
wmPtr->y = place.rcNormalPosition.top;
- TkInstallFrameMenu((Tk_Window) winPtr);
+ if (!(winPtr->flags & TK_ALREADY_DEAD)) {
+ TkInstallFrameMenu((Tk_Window) winPtr);
+ }
if (oldWrapper && (oldWrapper != wmPtr->wrapper)
&& !(wmPtr->exStyle & WS_EX_TOPMOST)) {