Changeset 2458 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 16, 2000, 7:17:13 PM (26 years ago)

Author:

cbratschi

Message:

menu and frame changes

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.43 2000-01-15 14:18:17 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.44 2000-01-16 18:17:12 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1123 +1123 @@
       {
         horzScrollInfo = (SCROLLBAR_INFO*)malloc(sizeof(SCROLLBAR_INFO));
+        if (!horzScrollInfo) break;
         horzScrollInfo->MinVal = horzScrollInfo->CurVal = horzScrollInfo->Page = 0;
         horzScrollInfo->MaxVal = 100;
@@ -1133 +1134 @@
       {
         vertScrollInfo = (SCROLLBAR_INFO*)malloc(sizeof(SCROLLBAR_INFO));
+        if (!vertScrollInfo) break;
         vertScrollInfo->MinVal = vertScrollInfo->CurVal = vertScrollInfo->Page = 0;
         vertScrollInfo->MaxVal = 100;
@@ -1406 +1408 @@
                 point.x = rectClient.left;
                 point.y = rectClient.top;
-                MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
+                ClientToScreen(getParent()->getWindowHandle(),&point);
 
                 lParam = MAKELONG(point.x, point.y);
             }
             else {//in screen coordinates
-                lParam = MAKELONG(rectWindow.left+rectClient.left, rectWindow.top+rectClient.top);
+                lParam = MAKELONG(rectClient.left,rectClient.top);
             }
             SendInternalMessageA(WM_MOVE, 0, lParam);