From dc15e989855b9081fcd9d2951c0fbed6103928c7 Mon Sep 17 00:00:00 2001
From: chengyemao <chengyemao>
Date: Wed, 5 Oct 2005 00:43:45 +0000
Subject: Fixed bug #1311734

---
 changes       | 5 ++++-
 win/tkWinWm.c | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changes b/changes
index f255ac5..448760b 100644
--- a/changes
+++ b/changes
@@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was
 released on March 13, 1991.  Changes that aren't backward compatible
 are marked specially.
 
-RCS: @(#) $Id: changes,v 1.88 2005/06/04 20:53:17 hobbs Exp $
+RCS: @(#) $Id: changes,v 1.89 2005/10/05 00:49:36 chengyemao Exp $
 
 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from
 the interpreter when the main window is deleted (otherwise there will
@@ -6062,3 +6062,6 @@ display/resizing (south)
 Documentation improvements [1087842,1081527,1115907,etc.]
 
 --- Released 8.5a3, June 4, 2005 --- See ChangeLog for details ---
+
+2005-10-04 (bug fix)[1311734] Fixed the problems that an embedded windows failed
+to respond to display changes (Windows platform) (chengyemao)
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 7de2134..f52942e 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.101 2005/09/11 01:37:15 chengyemao Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.102 2005/10/05 00:43:45 chengyemao Exp $
  */
 
 #include "tkWinInt.h"
@@ -7226,11 +7226,11 @@ InvalidateSubTreeDepth(winPtr)
     for (childPtr = winPtr->childList; childPtr != NULL;
 	 childPtr = childPtr->nextPtr) {
 	/*
-	 * We can stop the descent when we hit a toplevel window, as it
-	 * should get its own message.
+	 * We can stop the descent when we hit a non-embedded toplevel window, 
+	 * as it should get its own message.
 	 */
 
-	if (!Tk_TopWinHierarchy(childPtr)) {
+	if (childPtr->flags & TK_EMBEDDED || !Tk_TopWinHierarchy(childPtr)) {
 	    InvalidateSubTreeDepth(childPtr);
 	}
     }
-- 
cgit v0.12