From f865626b541db3a8a46433a66341abb779d4c876 Mon Sep 17 00:00:00 2001 From: Anton Tarasov Date: Fri, 21 Mar 2008 09:54:50 +0300 Subject: [PATCH] 6599270: Using EmbeddedFrame in SWT leads to a hang Excluding EmbeddedFrame from the workaround of activating a toplevel in not foreground process. Reviewed-by: son --- jdk/src/windows/native/sun/windows/awt_Frame.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Frame.cpp b/jdk/src/windows/native/sun/windows/awt_Frame.cpp index 2f22aff5dfd..37e8546ed49 100644 --- a/jdk/src/windows/native/sun/windows/awt_Frame.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Frame.cpp @@ -408,8 +408,9 @@ MsgRouting AwtFrame::WmShowWindow(BOOL show, UINT status) * message. This breaks Java focus. To workaround the problem we * set the toplevel being shown foreground programmatically. * The fix is localized to non-foreground process case only. + * (See also: 6599270) */ - if (show == TRUE && status == 0) { + if (!IsEmbeddedFrame() && show == TRUE && status == 0) { HWND fgHWnd = ::GetForegroundWindow(); if (fgHWnd != NULL) { DWORD fgProcessID;