Commit 137f41d1 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

WM_LBUTTONDOWN calls SetFocus under Windows. Remove the SetFocus in

WM_MOUSEACTIVATE.
parent f94159cd
...@@ -890,13 +890,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, ...@@ -890,13 +890,6 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg,
break; break;
case WM_MOUSEACTIVATE: case WM_MOUSEACTIVATE:
/*
* FIXME: maybe DefWindowProc() screws up, but it seems that
* modeless dialog boxes need this. If we don't do this, the focus
* will _not_ be set by DefWindowProc() for edit controls in a
* modeless dialog box ???
*/
SetFocus(hwnd);
result = MA_ACTIVATE; result = MA_ACTIVATE;
break; break;
...@@ -4242,6 +4235,7 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) ...@@ -4242,6 +4235,7 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y)
INT e; INT e;
BOOL after_wrap; BOOL after_wrap;
SetFocus(es->hwndSelf);
if (!(es->flags & EF_FOCUSED)) if (!(es->flags & EF_FOCUSED))
return 0; return 0;
......
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