summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchengyemao <chengyemao>2005-09-11 01:05:39 (GMT)
committerchengyemao <chengyemao>2005-09-11 01:05:39 (GMT)
commite7e02319e4848fafbf48a21ef4cd56c2e4ad4c90 (patch)
tree35d5c91d8a0950dc39d7254253a696f93e83f31d
parent03172432b3e289654da46234c5cb015b408b5976 (diff)
downloadtk-e7e02319e4848fafbf48a21ef4cd56c2e4ad4c90.zip
tk-e7e02319e4848fafbf48a21ef4cd56c2e4ad4c90.tar.gz
tk-e7e02319e4848fafbf48a21ef4cd56c2e4ad4c90.tar.bz2
Fixed bug# 1283635
-rw-r--r--win/tkWinWm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 941d726..1beb0ca 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.99 2005/04/07 20:14:42 mdejong Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.100 2005/09/11 01:05:39 chengyemao Exp $
*/
#include "tkWinInt.h"
@@ -2281,7 +2281,7 @@ UpdateWrapper(winPtr)
if (childStateInfo) {
if (wmPtr->numTransients > 0) {
/*
- * Reset all transient children for whom this is the master
+ * Reset all alive transient children for whom this is the master
*/
WmInfo *wmPtr2;
@@ -2289,7 +2289,8 @@ UpdateWrapper(winPtr)
for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
wmPtr2 = wmPtr2->nextPtr) {
if (wmPtr2->masterPtr == winPtr) {
- if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
+ if ( !(wmPtr2->flags & WM_NEVER_MAPPED)
+ && (wmPtr2->winPtr->flags & TK_ALREADY_DEAD)) {
UpdateWrapper(wmPtr2->winPtr);
TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]);
}