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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.227 2000-12-27 23:07:19 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.228 2000-12-29 18:39:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -30 +30 @@
 #include <misc.h>
 #include <heapstring.h>
-#include <win32wbase.h>
+#include <winuser32.h>
+#include "win32wbase.h"
 #include "wndmsg.h"
 #include "oslibwin.h"
@@ -3408 +3409 @@
 //******************************************************************************
 //******************************************************************************
-HWND Win32BaseWindow::Win32ToOS2Handle(HWND hwnd)
-{
-    Win32BaseWindow *window = GetWindowFromHandle(hwnd);
-
-    if(window) {
-            return window->getOS2WindowHandle();
-    }
-//    dprintf2(("Win32BaseWindow::Win32ToOS2Handle: not a win32 window %x", hwnd));
-    return hwnd;
-}
-//******************************************************************************
-//******************************************************************************
-HWND Win32BaseWindow::OS2ToWin32Handle(HWND hwnd)
-{
-    Win32BaseWindow *window = GetWindowFromOS2Handle(hwnd);
-
-    if(window) {
-            return window->getWindowHandle();
-    }
-//    dprintf2(("Win32BaseWindow::OS2ToWin32Handle: not a win32 window %x", hwnd));
-    return 0;
-//    else    return hwnd;    //OS/2 window handle
-}
-//******************************************************************************
-//******************************************************************************
 HWND Win32BaseWindow::getNextDlgTabItem(HWND hwndCtrl, BOOL fPrevious)
 {
@@ -3680 +3656 @@
 //******************************************************************************
 //******************************************************************************
+HWND WIN32API Win32ToOS2Handle(HWND hwnd)
+{
+    Win32BaseWindow *window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+
+    if(window) {
+            return window->getOS2WindowHandle();
+    }
+//    dprintf2(("Win32BaseWindow::Win32ToOS2Handle: not a win32 window %x", hwnd));
+    return hwnd;
+}
+//******************************************************************************
+//******************************************************************************
+HWND WIN32API OS2ToWin32Handle(HWND hwnd)
+{
+    Win32BaseWindow *window = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
+
+    if(window) {
+            return window->getWindowHandle();
+    }
+//    dprintf2(("Win32BaseWindow::OS2ToWin32Handle: not a win32 window %x", hwnd));
+    return 0;
+//    else    return hwnd;    //OS/2 window handle
+}
+//******************************************************************************
+//******************************************************************************
 
 GenericObject *Win32BaseWindow::windows  = NULL;