Mercurial > hg > release > icedtea7-forest-2.0 > jdk
changeset 4254:43be19b7c945
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 | 5b001da8768e |
children | 6303d3a93040 |
files | src/windows/native/sun/windows/awt_Frame.cpp |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Frame.cpp Thu Apr 28 19:23:44 2011 +0400 +++ b/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);