Revert the previous patch for capturing keys in an edit-listbox combo.
This commit is contained in:
parent
adb532903c
commit
eb359e26ca
|
@ -744,10 +744,20 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
case WM_GETDLGCODE:
|
case WM_GETDLGCODE:
|
||||||
result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS
|
result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
|
||||||
| DLGC_WANTMESSAGE;
|
if( es->hwndListBox )
|
||||||
/* Windows BUG! Windows always returns DLGC_WANTMESSAGE flag without additional checks. */
|
{
|
||||||
break;
|
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:
|
case WM_IME_CHAR:
|
||||||
if (!unicode)
|
if (!unicode)
|
||||||
|
|
Loading…
Reference in New Issue