Skip to content

W
wine-cw
Commit a762b4ce authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard
Browse files
Options

Revert the WM_GETDLGCODE handling patch completely this time. It

breaks too much.
parent c6464085
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 12 deletions
controls/edit.c
View file @ a762b4ce
......@@ -745,18 +745,21 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
case WM_GETDLGCODE:
result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
if( es->hwndListBox )
{
if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
{
int vk = (int)((LPMSG)lParam)->wParam;
if( vk == VK_RETURN || vk == VK_ESCAPE)
if( SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
result |= DLGC_WANTMESSAGE;
}
} else
/* It seems in all other cases Windows has this set: */
result |= DLGC_WANTMESSAGE;
if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
{
int vk = (int)((LPMSG)lParam)->wParam;
if (vk == VK_RETURN && (GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN))
{
result |= DLGC_WANTMESSAGE;
}
else if (es->hwndListBox && (vk == VK_RETURN || vk == VK_ESCAPE))
{
if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
result |= DLGC_WANTMESSAGE;
}
}
break;
case WM_IME_CHAR:
......
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