7034766: closed/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java failed on jdk7 b134
Reviewed-by: art, ant
--- 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);