Changeset 336 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Jul 19, 1999, 1:50:04 PM (26 years ago)

Author:

sandervl

Message:

Menus are displayed now

File:

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

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.13 1999-07-18 18:04:30 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.14 1999-07-19 11:50:04 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -29 +29 @@
 #include <oslibutil.h>
 #include <oslibgdi.h>
+#include <winres.h>
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -1032 +1033 @@
 BOOL Win32Window::SetMenu(ULONG hMenu)
 {
- PVOID menutemplate;
-
+ PVOID          menutemplate;
+ Win32Resource *winres = (Win32Resource *)hMenu;
+
+#if 1
+    if(winres == NULL) {
+        dprintf(("Win32Window:: Win32Resource *winres == 0"));
+        return FALSE;
+    }
+    menutemplate = winres->lockOS2Resource();
+    if(menutemplate == NULL)
+    {
+        dprintf(("Win32Window::SetMenu menutemplate == 0"));
+        return FALSE;
+    }
+    OS2HwndMenu = OSLibWinCreateMenu(OS2HwndFrame, menutemplate);
+    if(OS2HwndMenu == 0) {
+        dprintf(("Win32Window::SetMenu OS2HwndMenu == 0"));
+        return FALSE;
+    }
+    return TRUE;
+#else
    if(HMHandleTranslateToOS2(hMenu, (PULONG)&menutemplate) == NO_ERROR)
    {
@@ -1044 +1064 @@
    dprintf(("Win32Window::SetMenu unknown hMenu (%x)", hMenu));
    return FALSE;
+#endif
 }
 //******************************************************************************