Changeset 304 for trunk/src/user32/new/menu.cpp

Timestamp:

Jul 14, 1999, 11:05:59 PM (26 years ago)

Author:

cbratschi

Message:

several bugs fixed, RegisterClass works, CreateWindow on the way

File:

• trunk/src/user32/new/menu.cpp (modified) (8 diffs)

trunk/src/user32/new/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.1 1999-07-14 08:35:35 sandervl Exp $ */
+/* $Id: menu.cpp,v 1.2 1999-07-14 21:05:58 cbratschi Exp $ */
 
 /*
@@ -17 +17 @@
  */
 #include <os2win.h>
+#include <stdlib.h>
 
 //******************************************************************************
@@ -88 +89 @@
     free(astring);
     if(rc) {
-                dprintf(("USER32: OS2GetMenuStringW %s\n", astring));
-                AsciiToUnicode(astring, lpsz);
+                dprintf(("USER32: OS2GetMenuStringW %s\n", astring));
+                AsciiToUnicode(astring, lpsz);
     }
-    else        lpsz[0] = 0;
+    else        lpsz[0] = 0;
     return(rc);
 }
@@ -158 +159 @@
 #endif
   if(lpPM->cbSize != 0)
-        rect = &lpPM->rcExclude;
+        rect = &lpPM->rcExclude;
 
   return O32_TrackPopupMenu(hmenu, flags, X, Y, 0, hwnd, rect);
@@ -165 +166 @@
 //******************************************************************************
 BOOL WIN32API AppendMenuA(HMENU hMenu, UINT uFlags, UINT ulDNewItem,
-                             LPCSTR lpNewItem)
+                             LPCSTR lpNewItem)
 {
 #ifdef DEBUG
@@ -173 +174 @@
 
     if(uFlags & MF_STRING || uFlags == 0)
-            WriteLog("USER32:  OS2AppendMenuA %s\n", lpNewItem);
+            WriteLog("USER32:  OS2AppendMenuA %s\n", lpNewItem);
 
     rc = O32_AppendMenu(hMenu, uFlags, ulDNewItem, lpNewItem);
@@ -358 +359 @@
 //******************************************************************************
 BOOL WIN32API CheckMenuRadioItem(HMENU hmenu, UINT idFirst, UINT idLast,
-                                    UINT idCheck, UINT uFlags)
+                                    UINT idCheck, UINT uFlags)
 {
 #ifdef DEBUG
@@ -407 +408 @@
 //******************************************************************************
 BOOL WIN32API SetMenuItemInfoA(HMENU hmenu, UINT par1, BOOL par2,
-                               const MENUITEMINFOA * lpMenuItemInfo)
+                               const MENUITEMINFOA * lpMenuItemInfo)
 {
 #ifdef DEBUG