Changeset 4597 for trunk/src

Timestamp:

Nov 15, 2000, 2:57:57 PM (25 years ago)

Author:

sandervl

Message:

export selectClientArea for gdi32

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• dc.cpp (modified) (3 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.42 2000-11-14 14:27:47 sandervl Exp $
+; $Id: USER32.DEF,v 1.43 2000-11-15 13:57:54 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -666 +666 @@
     _Calculate1PixelDelta@4                                      @2022
     _DIB_GetDIBWidthBytes@8                                      @2023
+    _selectClientArea@4                                          @2024

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.77 2000-11-09 18:15:17 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.78 2000-11-15 13:57:56 sandervl Exp $ */
 
 /*
@@ -361 +361 @@
                    SETUPDC_ORIGIN | SETUPDC_VISRGN | SETUPDC_RECALCCLIP);
    }
-   else dprintf2(("removeClientArea: %x (%d,%d)", window->getWindowHandle(), point.x, point.y));
+   else dprintf2(("removeClientArea: %x (%d,%d) (%d,%d)", window->getWindowHandle(), point.x, point.y, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
 
 }
@@ -511 +511 @@
 
    wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
-   removeClientArea(wnd, pHps);
+   if(wnd) {
+      removeClientArea(wnd, pHps);
+   }
+}
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API selectClientArea(pDCData pHps)
+{
+ Win32BaseWindow *wnd;
+
+   wnd = Win32BaseWindow::GetWindowFromOS2Handle(pHps->hwnd);
+   if(wnd) {
+      selectClientArea(wnd, pHps);
+   }
 }
 //******************************************************************************

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.25 2000-10-17 17:11:08 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.26 2000-11-15 13:57:57 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -424 +424 @@
         winRect->right  -= tmpRect.right;
         winRect->bottom -= tmpRect.bottom;
+
+        if (winRect->top > winRect->bottom)
+            winRect->bottom = winRect->top;
+
+        if (winRect->left > winRect->right)
+            winRect->right = winRect->left;
     }