mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-02 20:18:28 +00:00
Revert the previous patch for capturing keys in an edit-listbox combo.
This commit is contained in:
parent
adb532903c
commit
eb359e26ca
1 changed files with 14 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue