mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:26:10 +00:00
Revert the WM_GETDLGCODE handling patch completely this time. It
breaks too much.
This commit is contained in:
parent
c646408568
commit
a762b4ce2f
1 changed files with 15 additions and 12 deletions
|
@ -745,18 +745,21 @@ 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;
|
||||||
if( es->hwndListBox )
|
|
||||||
{
|
if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
|
||||||
if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN))
|
{
|
||||||
{
|
int vk = (int)((LPMSG)lParam)->wParam;
|
||||||
int vk = (int)((LPMSG)lParam)->wParam;
|
|
||||||
if( vk == VK_RETURN || vk == VK_ESCAPE)
|
if (vk == VK_RETURN && (GetWindowLongW( hwnd, GWL_STYLE ) & ES_WANTRETURN))
|
||||||
if( SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
|
{
|
||||||
result |= DLGC_WANTMESSAGE;
|
result |= DLGC_WANTMESSAGE;
|
||||||
}
|
}
|
||||||
} else
|
else if (es->hwndListBox && (vk == VK_RETURN || vk == VK_ESCAPE))
|
||||||
/* It seems in all other cases Windows has this set: */
|
{
|
||||||
result |= DLGC_WANTMESSAGE;
|
if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0))
|
||||||
|
result |= DLGC_WANTMESSAGE;
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case WM_IME_CHAR:
|
case WM_IME_CHAR:
|
||||||
|
|
Loading…
Reference in a new issue