Changeset 2433 for trunk/src/user32/new/pmframe.cpp

Timestamp:

Jan 13, 2000, 9:11:39 PM (26 years ago)

Author:

sandervl

Message:

Client rectangle changes, GetDCEx bugfix (CS_OWNDC), scroll rectangle calculation fixes

File:

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

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.15 2000-01-13 13:54:52 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.16 2000-01-13 20:11:37 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -287 +287 @@
 
           //CB: todo: use result for WM_CALCVALIDRECTS
-          mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+//          mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+          mapWin32ToOS2Rect(win32wnd->getOS2FrameWindowHandle(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
 
           swpClient.hwnd = win32wnd->getOS2WindowHandle();
@@ -451 +452 @@
         win32wnd->MsgFormatFrame(NULL);
         //CB: todo: use result for WM_CALCVALIDRECTS
-        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+//        mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
+        mapWin32ToOS2Rect(win32wnd->getOS2FrameWindowHandle(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
+
 
         swpClient.hwnd = win32wnd->getOS2WindowHandle();