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

Timestamp:

Dec 29, 2000, 7:41:23 PM (25 years ago)

Author:

sandervl

Message:

Win32ToOS2Handle & OS2ToWin32Handle exported with stdcall calling convention

File:

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

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.85 2000-12-17 15:04:13 sandervl Exp $ */
+/* $Id: window.cpp,v 1.86 2000-12-29 18:40:00 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -37 +37 @@
 #include <win\win.h>
 #include <heapstring.h>
+#include <winuser32.h>
 
 #define DBG_LOCALLOG    DBG_window
@@ -669 +670 @@
     BOOL activate;
 
-    hwnd_O    = Win32BaseWindow::Win32ToOS2Handle (hwnd);
+    hwnd_O    = Win32ToOS2Handle (hwnd);
     lastFocus = OSLibWinQueryFocus (OSLIB_HWND_DESKTOP);
     activate  = ((hwnd_O == lastFocus) || OSLibWinIsChild (lastFocus, hwnd_O));
-    lastFocus_W = Win32BaseWindow::OS2ToWin32Handle (lastFocus);
+    lastFocus_W = OS2ToWin32Handle (lastFocus);
 
     dprintf(("SetFocus %x (%x) -> %x (%x)\n", lastFocus_W, lastFocus, hwnd, hwnd_O));
@@ -685 +686 @@
 
     hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
-    hwnd = Win32BaseWindow::OS2ToWin32Handle(hwnd);
+    hwnd = OS2ToWin32Handle(hwnd);
     dprintf(("USER32: GetFocus %x\n", hwnd));
     return hwnd;
@@ -705 +706 @@
 {
     dprintf(("USER32: LockWindowUpdate %x", hwnd));
-    return OSLibWinLockWindowUpdate(Win32BaseWindow::Win32ToOS2Handle(hwnd));
+    return OSLibWinLockWindowUpdate(Win32ToOS2Handle(hwnd));
 }
 //******************************************************************************
@@ -1148 +1149 @@
 {
     dprintf(("FlashWindow %x %d\n", hwnd, fFlash));
-//    return OSLibWinFlashWindow(Win32BaseWindow::Win32ToOS2Handle(hwnd), fFlash);
+//    return OSLibWinFlashWindow(Win32ToOS2Handle(hwnd), fFlash);
     return 1;
 }
@@ -1521 +1522 @@
     if(hwndOS2)
     {
-      hwnd = Win32BaseWindow::OS2ToWin32Handle(hwndOS2);
+      hwnd = OS2ToWin32Handle(hwndOS2);
       if(hwnd) {
               dprintf(("WindowFromPoint (%d,%d) %x->%x\n", point.x, point.y, hwndOS2, hwnd));
@@ -1591 +1592 @@
 {
     dprintf(("USER32:  ArrangeIconicWindows %x", hwnd));
-    return O32_ArrangeIconicWindows(Win32BaseWindow::Win32ToOS2Handle(hwnd));
+    return O32_ArrangeIconicWindows(Win32ToOS2Handle(hwnd));
 }
 //******************************************************************************
@@ -1666 +1667 @@
  HWND hwnd;
 
-    hwnd = Win32BaseWindow::OS2ToWin32Handle(OSLibWinQueryActiveWindow());
+    hwnd = OS2ToWin32Handle(OSLibWinQueryActiveWindow());
     dprintf(("USER32: GetForegroundWindow returned %x", hwnd));
     return hwnd;
@@ -1676 +1677 @@
  HWND hwnd;
 
-    hwnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
-    hwnd = Win32BaseWindow::OS2ToWin32Handle(O32_GetLastActivePopup(hwnd));
+    hwnd = Win32ToOS2Handle(hWnd);
+    hwnd = OS2ToWin32Handle(O32_GetLastActivePopup(hwnd));
 
     dprintf(("GetLastActivePopup %x returned %x NOT CORRECTLY IMPLEMENTED", hWnd, hwnd));
@@ -1687 +1688 @@
 {
     dprintf2(("USER32:  GetWindowThreadProcessId"));
-    hWnd = Win32BaseWindow::Win32ToOS2Handle(hWnd);
+    hWnd = Win32ToOS2Handle(hWnd);
 
     return O32_GetWindowThreadProcessId(hWnd,lpdwProcessId);