Revert the previous patch for capturing keys in an edit-listbox combo.

This commit is contained in:
Rein Klazes 2003-05-15 04:14:53 +00:00 committed by Alexandre Julliard
parent adb532903c
commit eb359e26ca

View file

@ -744,10 +744,20 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
*/
case WM_GETDLGCODE:
result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS
| DLGC_WANTMESSAGE;
/* Windows BUG! Windows always returns DLGC_WANTMESSAGE flag without additional checks. */
break;
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;
break;
case WM_IME_CHAR:
if (!unicode)