Commit 7a06d45f authored by Gerard Patel's avatar Gerard Patel Committed by Alexandre Julliard

Do not send WM_MOUSEACTIVATE for children of desktop.

parent 71c69849
...@@ -2952,8 +2952,6 @@ static LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg, ...@@ -2952,8 +2952,6 @@ static LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
return LISTBOX_HandleHScroll( wnd, descr, wParam ); return LISTBOX_HandleHScroll( wnd, descr, wParam );
case WM_VSCROLL: case WM_VSCROLL:
return LISTBOX_HandleVScroll( wnd, descr, wParam ); return LISTBOX_HandleVScroll( wnd, descr, wParam );
case WM_MOUSEACTIVATE:
return MA_NOACTIVATE;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
if (wParam & (MK_SHIFT | MK_CONTROL)) if (wParam & (MK_SHIFT | MK_CONTROL))
return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) :
...@@ -3178,8 +3176,6 @@ static LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg, ...@@ -3178,8 +3176,6 @@ static LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
return LISTBOX_HandleLButtonDownCombo(wnd, descr, msg, wParam, return LISTBOX_HandleLButtonDownCombo(wnd, descr, msg, wParam,
(INT16)LOWORD(lParam), (INT16)LOWORD(lParam),
(INT16)HIWORD(lParam) ); (INT16)HIWORD(lParam) );
case WM_MOUSEACTIVATE:
return MA_NOACTIVATE;
case WM_NCACTIVATE: case WM_NCACTIVATE:
return FALSE; return FALSE;
case WM_KEYDOWN: case WM_KEYDOWN:
......
...@@ -316,7 +316,7 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest, ...@@ -316,7 +316,7 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest,
/* Activate the window if needed */ /* Activate the window if needed */
if (hWnd != GetActiveWindow() && hWnd != GetDesktopWindow()) if (hWnd != GetActiveWindow() && hwndTop != GetDesktopWindow())
{ {
LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop, LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop,
MAKELONG( hittest, message ) ); MAKELONG( hittest, message ) );
......
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