Changeset 1513 for trunk/src/user32/oslibmenu.cpp

Timestamp:

Oct 30, 1999, 11:19:47 AM (26 years ago)

Author:

sandervl

Message:

EB's unicode changes + seticon + mdi fixes

File:

• trunk/src/user32/oslibmenu.cpp (modified) (3 diffs)

trunk/src/user32/oslibmenu.cpp

@@ -1 @@
-/* $Id: oslibmenu.cpp,v 1.3 1999-10-25 20:17:18 sandervl Exp $ */
+/* $Id: oslibmenu.cpp,v 1.4 1999-10-30 09:19:44 sandervl Exp $ */
 /*
  * Window Menu wrapper functions for OS/2
@@ -31 +31 @@
    if (currMenu)
    {
+      dprintf(("OSLibWinSetMenu: old menu %x, new menu %x", currMenu, hMenu));
       WinSetOwner (currMenu, HWND_OBJECT);
       WinSetParent(currMenu, HWND_OBJECT, FALSE);
@@ -37 +38 @@
    if (hMenu)
    {
-      if(WinIsWindow(GetThreadHAB(), hMenu) == TRUE) {
-         WinSetOwner (hMenu, hwndParent);
-         WinSetParent(hMenu, hwndParent, FALSE );
-         WinSetWindowUShort(hMenu, QWS_ID, FID_MENU);
-     WinSendMsg(hwndParent, WM_UPDATEFRAME, (MPARAM)FCF_MENU, 0);
-     return hMenu;
-      }
+        if(WinIsWindow(GetThreadHAB(), hMenu) == TRUE) 
+        {
+                WinSetOwner (hMenu, hwndParent);
+                WinSetParent(hMenu, hwndParent, FALSE );
+                WinSetWindowUShort(hMenu, QWS_ID, FID_MENU);
+                WinSendMsg(hwndParent, WM_UPDATEFRAME, (MPARAM)FCF_MENU, 0);
+                return hMenu;
+        }
+        else {
+                dprintf(("OSLibWinSetMenu: %x = invalid menu handle", hMenu));
+        }
    }
    return 0;