Changeset 740 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Aug 29, 1999, 10:05:08 PM (26 years ago)

Author:

sandervl

Message:

Mouse message handling changes

File:

• trunk/src/user32/new/pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.24 1999-08-28 19:32:46 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.25 1999-08-29 20:05:07 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -434 +434 @@
     case WM_MOUSEMOVE:
     {
+        //Only send this message when the mouse isn't captured
+        if(WinQueryCapture(HWND_DESKTOP) != NULLHANDLE) {
+                goto RunDefWndProc;
+        }
         ULONG keystate = 0;
         if(WinGetKeyState(HWND_DESKTOP, VK_BUTTON1))
@@ -589 +593 @@
 
     case WM_HITTEST:
-        if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
-                goto RunDefWndProc;
-        }
+        // Only send this message if the window is enabled
+        if (WinIsWindowEnabled(hwnd)) 
+        {
+                if(win32wnd->MsgHitTest((*(POINTS *)&mp1).x, MapOS2ToWin32Y(OSLIB_HWND_DESKTOP, hwnd, (*(POINTS *)&mp1).y))) {
+                        goto RunDefWndProc;
+                }
+        }
+        else    goto RunDefWndProc;
         break;