Skip to content

W
wine-winehq
Commit a4b73d43 authored by Sheri Steeves's avatar Sheri Steeves Committed by Alexandre Julliard
Browse files
Options

Check again for GetNextDlgTabItem after return from WM_INITDIALOG

message in dialog creation.
parent ac3e8164
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
windows/dialog.c
View file @ a4b73d43
......@@ -792,14 +792,22 @@ HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCSTR dlgTemplate,
hwndPreInitFocus = GetFocus();
if (SendMessageA( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ))
{
/* check where the focus is again, some controls status might have changed in
WM_INITDIALOG */
dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE);
SetFocus( dlgInfo->hwndFocus );
}
else
{
/* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
but the focus has not changed, set the focus where we expect it. */
if ( (wndPtr->dwStyle & WS_VISIBLE) && ( GetFocus() == hwndPreInitFocus ) )
{
dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE);
SetFocus( dlgInfo->hwndFocus );
}
}
if (template.style & WS_VISIBLE && !(wndPtr->dwStyle & WS_VISIBLE))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment