[PATCH] WM_MOUSEACTIVATE not received by children of desktop

[gerard patel]

Children of the desktop seem to never receive WM_MOUSEACTIVATE messages
under Windows. Also removes handlers for combo and listbox controls that are
no longer necessary.

ChangeLog:

	* windows/message.c, controls/listbox.c
                  Do not send WM_MOUSEACTIVATE for children of desktop


-------------- next part --------------
Index: controls/listbox.c
===================================================================
RCS file: /home/wine/wine/controls/listbox.c,v
retrieving revision 1.73
diff -u -r1.73 listbox.c
--- controls/listbox.c	2001/04/16 19:32:19	1.73
+++ controls/listbox.c	2001/04/17 00:18:35
@@ -2952,8 +2952,6 @@
         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 @@
                      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:
Index: windows/message.c
===================================================================
RCS file: /home/wine/wine/windows/message.c,v
retrieving revision 1.100
diff -u -r1.100 message.c
--- windows/message.c	2001/04/12 21:09:03	1.100
+++ windows/message.c	2001/04/17 00:18:41
@@ -316,7 +316,7 @@
 
             /* 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 ) );
-------------- next part --------------