diff options
| author | hobbs <hobbs@noemail.net> | 2005-11-30 22:58:06 (GMT) |
|---|---|---|
| committer | hobbs <hobbs@noemail.net> | 2005-11-30 22:58:06 (GMT) |
| commit | cdeaec29b630a5bf2872980b125a76b82a1f732e (patch) | |
| tree | efaa70682910c2805999e866fd447cf69bab006f /win/tkWinWm.c | |
| parent | 7195d380c504c69b9f270b8ce6beccb09b92b2b8 (diff) | |
| download | tk-cdeaec29b630a5bf2872980b125a76b82a1f732e.zip tk-cdeaec29b630a5bf2872980b125a76b82a1f732e.tar.gz tk-cdeaec29b630a5bf2872980b125a76b82a1f732e.tar.bz2 | |
* win/tkWinWm.c (UpdateWrapper): Don't install frame menu on dead
window. Backport of 1233635
FossilOrigin-Name: 874e3b4a4492af6846f0bbce1f1f74f0a6e21293
Diffstat (limited to 'win/tkWinWm.c')
| -rw-r--r-- | win/tkWinWm.c | 6 |
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)) { |