Changeset 4848 for trunk/src/user32/pmwindow.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/pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.110 2000-12-24 14:54:07 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.111 2000-12-29 18:39:58 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -22 +22 @@
 #include <win32type.h>
 #include <winconst.h>
+#include <winuser32.h>
 #include <wprocess.h>
 #include <misc.h>
@@ -581 +582 @@
       HWND hwndFocus = (HWND)mp1;
 
-        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, Win32BaseWindow::OS2ToWin32Handle(hwndFocus), mp2));
+        dprintf(("OS2: WM_SETFOCUS %x %x (%x) %d", win32wnd->getWindowHandle(), mp1, OS2ToWin32Handle(hwndFocus), mp2));
         if(WinQueryWindowULong(hwndFocus, OFFSET_WIN32PM_MAGIC) != WIN32PM_MAGIC) {
                 //another (non-win32) application's window
@@ -588 +589 @@
         }
         if((ULONG)mp2 == TRUE) {
-                HWND hwndFocusWin32 = Win32BaseWindow::OS2ToWin32Handle(hwndFocus);
+                HWND hwndFocusWin32 = OS2ToWin32Handle(hwndFocus);
                 recreateCaret (hwndFocusWin32);
                 win32wnd->MsgSetFocus(hwndFocusWin32);
         }
-        else win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
+        else win32wnd->MsgKillFocus(OS2ToWin32Handle(hwndFocus));
         break;
     }