Changeset 2406 for trunk/src/user32/new/win32wbase.cpp

Timestamp:

Jan 11, 2000, 2:06:27 PM (26 years ago)

Author:

sandervl

Message:

Lots of menu fixes

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.31 2000-01-11 10:38:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.32 2000-01-11 13:06:26 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -654 +654 @@
   {
         if (cs->hMenu) {
-            SetMenu(cs->hMenu);
+            ::SetMenu(getWindowHandle(), cs->hMenu);
         }
         else {
                 if (windowClass->getMenuNameA()) {
                         cs->hMenu = LoadMenuA(cs->hInstance, windowClass->getMenuNameA());
-                        if (cs->hMenu) SetMenu(cs->hMenu );
+                        if (cs->hMenu) ::SetMenu(getWindowHandle(), cs->hMenu );
                 }
         }
@@ -1673 +1673 @@
 
     default:
-        if(Msg > WM_USER) {
-            return 0;
-        }
-        return 1; //CB: shouldn't this be 0?
+        return 0;
     }
 }