From 7a06d45fca765e05f70d5cc7d560d12f290ccbc7 Mon Sep 17 00:00:00 2001 From: Gerard Patel Date: Tue, 17 Apr 2001 17:57:20 +0000 Subject: [PATCH] Do not send WM_MOUSEACTIVATE for children of desktop. --- controls/listbox.c | 4 ---- windows/message.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/controls/listbox.c b/controls/listbox.c index 5960c4563e8..f4d04e995ca 100644 --- a/controls/listbox.c +++ b/controls/listbox.c @@ -2952,8 +2952,6 @@ static LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg, return LISTBOX_HandleHScroll( wnd, descr, wParam ); case WM_VSCROLL: return LISTBOX_HandleVScroll( wnd, descr, wParam ); - case WM_MOUSEACTIVATE: - return MA_NOACTIVATE; case WM_MOUSEWHEEL: if (wParam & (MK_SHIFT | MK_CONTROL)) return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : @@ -3178,8 +3176,6 @@ static LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg, return LISTBOX_HandleLButtonDownCombo(wnd, descr, msg, wParam, (INT16)LOWORD(lParam), (INT16)HIWORD(lParam) ); - case WM_MOUSEACTIVATE: - return MA_NOACTIVATE; case WM_NCACTIVATE: return FALSE; case WM_KEYDOWN: diff --git a/windows/message.c b/windows/message.c index a9c0b45a497..f1ea0cd4b30 100644 --- a/windows/message.c +++ b/windows/message.c @@ -316,7 +316,7 @@ static DWORD MSG_ProcessMouseMsg( MSG *msg, BOOL remove, INT16 hittest, /* Activate the window if needed */ - if (hWnd != GetActiveWindow() && hWnd != GetDesktopWindow()) + if (hWnd != GetActiveWindow() && hwndTop != GetDesktopWindow()) { LONG ret = SendMessageA( hWnd, WM_MOUSEACTIVATE, hwndTop, MAKELONG( hittest, message ) );