Changeset 1256 for trunk/src/user32/uitools.cpp

Timestamp:

Oct 12, 1999, 4:47:24 PM (26 years ago)

Author:

sandervl

Message:

MDI fix, extra message support etc

File:

• trunk/src/user32/uitools.cpp (modified) (4 diffs)

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.12 1999-10-10 11:26:34 cbratschi Exp $ */
+/* $Id: uitools.cpp,v 1.13 1999-10-12 14:47:22 sandervl Exp $ */
 /*
  * User Interface Functions
@@ -14 +14 @@
 #include "winuser.h"
 #include "user32.h"
+#include "win32wbase.h"
 
 static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555,
@@ -1781 +1782 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API DrawMenuBar( HWND arg1)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  DrawMenuBar\n");
-#endif
-    return O32_DrawMenuBar(arg1);
+BOOL WIN32API DrawMenuBar(HWND hwnd)
+{
+ Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
+        dprintf(("DrawMenuBar, window %x not found", hwnd));
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        return 0;
+    }
+    dprintf(("DrawMenuBar\n"));
+    return O32_DrawMenuBar(window->getOS2FrameWindowHandle());
 }
 //******************************************************************************
@@ -2032 +2039 @@
       INT  nLen;
 
-      nLen = O32_GetWindowText (hwnd,
+      nLen = O32_GetWindowText (Win32BaseWindow::Win32ToOS2FrameHandle(hwnd),
                                 szText,
                                 128);