Changeset 1039 for trunk/src/user32/window.cpp

Timestamp:

Sep 25, 1999, 11:27:08 AM (26 years ago)

Author:

dengert

Message:

fixed ClientToScreen adn ScreenToClient

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.7 1999-09-24 22:45:28 sandervl Exp $ */
+/* $Id: window.cpp,v 1.8 1999-09-25 09:27:08 dengert Exp $ */
 /*
  * Win32 window apis for OS/2
  *
  * Copyright 1999 Sander van Leeuwen
+ * Copyright 1999 Daniela Engert (dani@ngrt.de)
  *
  * Parts based on Wine Windows code (windows\win.c)
@@ -778 +779 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API ClientToScreen( HWND arg1, PPOINT  arg2)
-{
-#ifdef DEBUG
-////    WriteLog("USER32:  ClientToScreen\n");
-#endif
-    return O32_ClientToScreen(arg1, arg2);
+BOOL WIN32API ClientToScreen (HWND hwnd, PPOINT pt)
+{
+#ifdef DEBUG
+   WriteLog("USER32:  ClientToScreen\n");
+#endif
+    Win32BaseWindow *wnd;
+    PRECT rcl;
+
+    if (!hwnd) return (TRUE);
+    wnd = Win32BaseWindow::GetWindowFromHandle (hwnd);
+    if (!wnd) return (TRUE);
+
+    rcl  = wnd->getClientRect();
+    pt->y = (rcl->bottom - rcl->top) - pt->y;
+    OSLibWinMapWindowPoints (wnd->getOS2WindowHandle(), OSLIB_HWND_DESKTOP, (OSLIBPOINT *)pt, 1);
+    pt->y = ScreenHeight - pt->y;
+    return (TRUE);
 }
 //******************************************************************************
@@ -1152 +1164 @@
 //******************************************************************************
 //******************************************************************************
+