summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2005-09-11 01:37:15 (GMT)
committerchengyemao <chengyemao>2005-09-11 01:37:15 (GMT)
commit8b77efee80bae35665d684d1f4cfdd135b934bcd (patch)
treeb613fc2d72be4e6369c80f8b279b4d43209e9b91
parente7e02319e4848fafbf48a21ef4cd56c2e4ad4c90 (diff)
downloadtk-8b77efee80bae35665d684d1f4cfdd135b934bcd.zip
tk-8b77efee80bae35665d684d1f4cfdd135b934bcd.tar.gz
tk-8b77efee80bae35665d684d1f4cfdd135b934bcd.tar.bz2
Fixed bug# 1283635
-rw-r--r--win/tkWinWm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 1beb0ca..7de2134 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.100 2005/09/11 01:05:39 chengyemao Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.101 2005/09/11 01:37:15 chengyemao Exp $
*/
#include "tkWinInt.h"
@@ -2141,7 +2141,8 @@ 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)) {
@@ -2281,7 +2282,7 @@ UpdateWrapper(winPtr)
if (childStateInfo) {
if (wmPtr->numTransients > 0) {
/*
- * Reset all alive transient children for whom this is the master
+ * Reset all transient children for whom this is the master
*/
WmInfo *wmPtr2;
@@ -2289,8 +2290,7 @@ UpdateWrapper(winPtr)
for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
wmPtr2 = wmPtr2->nextPtr) {
if (wmPtr2->masterPtr == winPtr) {
- if ( !(wmPtr2->flags & WM_NEVER_MAPPED)
- && (wmPtr2->winPtr->flags & TK_ALREADY_DEAD)) {
+ if ( !(wmPtr2->flags & WM_NEVER_MAPPED)) {
UpdateWrapper(wmPtr2->winPtr);
TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]);
}