stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6567410: PIT : java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java fails

Browse Source 
A filter flag has been added to the HCBT focus hook.

Reviewed-by: dcherepanov
This commit is contained in:
Anton Tarasov 2008-03-19 16:23:50 +03:00
parent 723e255938
commit a24634be6b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/src/windows/native/sun/windows/awt_Window.cpp
View File

@ -334,8 +334,11 @@ LRESULT CALLBACK AwtWindow::CBTFilter(int nCode, WPARAM wParam, LPARAM lParam)
if (nCode == HCBT_ACTIVATE || nCode == HCBT_SETFOCUS) { if (nCode == HCBT_ACTIVATE || nCode == HCBT_SETFOCUS) {
AwtComponent *comp = AwtComponent::GetComponent((HWND)wParam); AwtComponent *comp = AwtComponent::GetComponent((HWND)wParam);
if (comp != NULL && comp->IsTopLevel() && !((AwtWindow*)comp)->IsFocusableWindow()) { if (comp != NULL && comp->IsTopLevel()) {
return 1; // Don't change focus/activation. 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); return ::CallNextHookEx(AwtWindow::ms_hCBTFilter, nCode, wParam, lParam);