Changeset 2445 for trunk/src/user32/new/win32wbasenonclient.cpp

Timestamp:

Jan 15, 2000, 4:05:37 PM (26 years ago)

Author:

sandervl

Message:

ScrollWindow & non-client scroll tracking bugfixes/changes

File:

• trunk/src/user32/new/win32wbasenonclient.cpp (modified) (4 diffs)

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.8 2000-01-15 14:18:18 cbratschi Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.9 2000-01-15 15:05:37 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -194 +194 @@
     if ((wParam & 0x0f) != HTHSCROLL) return;
     scrollbar = SB_HORZ;
-  } else  /* SC_VSCROLL */
+  }
+  else  /* SC_VSCROLL */
   {
     if ((wParam & 0x0f) != HTVSCROLL) return;
@@ -203 +204 @@
   pt.y -= rectWindow.top;
   SCROLL_HandleScrollEvent(Win32Hwnd,0,MAKELONG(pt.x,pt.y),scrollbar,WM_LBUTTONDOWN);
-  if (GetCapture() != Win32Hwnd) return;
+  if (GetCapture() != getWindowHandle()) return;
   do
   {
-    GetMessageA(&msg,Win32Hwnd,0,0);
-    switch(msg.message)
-    {
-      case WM_LBUTTONUP:
-      case WM_MOUSEMOVE:
-        pt.x = msg.pt.x-rectWindow.left;
-        pt.y = msg.pt.y-rectWindow.top;
-        msg.lParam = MAKELONG(pt.x,pt.y);
-      case WM_SYSTIMER:
-        SCROLL_HandleScrollEvent(Win32Hwnd,msg.wParam,msg.lParam,scrollbar,msg.message);
-        break;
-
-      default:
+    GetMessageA(&msg, 0, 0, 0);
+    if(msg.hwnd == getWindowHandle())
+    {
+        switch(msg.message)
+        {
+        case WM_LBUTTONUP:
+        case WM_MOUSEMOVE:
+            pt.x = msg.pt.x-rectWindow.left;
+            pt.y = msg.pt.y-rectWindow.top;
+            msg.lParam = MAKELONG(pt.x,pt.y);
+
+        case WM_SYSTIMER:
+            SCROLL_HandleScrollEvent(Win32Hwnd,msg.wParam,msg.lParam,scrollbar,msg.message);
+            break;
+
+        default:
+            TranslateMessage(&msg);
+            DispatchMessageA(&msg);
+            break;
+        }
+    }
+    else {
         TranslateMessage(&msg);
         DispatchMessageA(&msg);
-        break;
     }
     if (!IsWindow())
@@ -228 +237 @@
       break;
     }
-  } while (msg.message != WM_LBUTTONUP);
+  }
+  while (msg.message != WM_LBUTTONUP);
 }
 //******************************************************************************