Changeset 2446 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

cvs merge messed things up

File:

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

trunk/src/user32/new/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.9 2000-01-15 15:05:37 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.10 2000-01-15 15:37:31 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;
@@ -204 +203 @@
   pt.y -= rectWindow.top;
   SCROLL_HandleScrollEvent(Win32Hwnd,0,MAKELONG(pt.x,pt.y),scrollbar,WM_LBUTTONDOWN);
-  if (GetCapture() != getWindowHandle()) return;
+  if (GetCapture() != Win32Hwnd) return;
   do
   {
@@ -237 +236 @@
       break;
     }
-  }
-  while (msg.message != WM_LBUTTONUP);
+  } while (msg.message != WM_LBUTTONUP);
 }
 //******************************************************************************