# HG changeset patch
# User ant
# Date 1205933030 -10800
# Node ID fe5ccd4774b4dc3250f0d96ccb330ec3af518032
# Parent  f995b9c9c5fab22259e7b5681a027e00a90ff256
6567410: PIT : java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java fails
Summary: A filter flag has been added to the HCBT focus hook.
Reviewed-by: dcherepanov

diff -r f995b9c9c5fa -r fe5ccd4774b4 jdk/src/windows/native/sun/windows/awt_Window.cpp
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp	Tue Mar 18 16:19:03 2008 +0300
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp	Wed Mar 19 16:23:50 2008 +0300
@@ -334,8 +334,11 @@
     if (nCode == HCBT_ACTIVATE || nCode == HCBT_SETFOCUS) {
         AwtComponent *comp = AwtComponent::GetComponent((HWND)wParam);
 
-        if (comp != NULL && comp->IsTopLevel() && !((AwtWindow*)comp)->IsFocusableWindow()) {
-            return 1; // Don't change focus/activation.
+        if (comp != NULL && comp->IsTopLevel()) {
+            AwtWindow* win = (AwtWindow*)comp;
+            if (!win->IsFocusableWindow() || win->m_filterFocusAndActivation) {
+                return 1; // Don't change focus/activation.
+            }
         }
     }
     return ::CallNextHookEx(AwtWindow::ms_hCBTFilter, nCode, wParam, lParam);