changeset 9480:d8dd7ecdfb05

7034766: closed/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java failed on jdk7 b134 Reviewed-by: art, ant
author dcherepanov
date Thu, 28 Apr 2011 19:39:47 +0400
parents ea7a57569d30
children fd8eab58a220
files jdk/src/windows/native/sun/windows/awt_Frame.cpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp	Thu Apr 28 19:23:44 2011 +0400
+++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp	Thu Apr 28 19:39:47 2011 +0400
@@ -340,12 +340,16 @@
             }
             break;
         case WM_SETFOCUS:
+            if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
+
             if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
                 AwtSetActiveWindow();
             }
             mr = mrConsume;
             break;
         case WM_KILLFOCUS:
+            if (sm_inSynthesizeFocus) break; // pass it up the WindowProc chain
+
             if (!sm_suppressFocusAndActivation && IsEmbeddedFrame()) {
                 AwtWindow::SynthesizeWmActivate(FALSE, GetHWnd(), NULL);