Changeset 4548 for trunk/src

Timestamp:

Nov 1, 2000, 9:51:37 PM (25 years ago)

Author:

sandervl

Message:

BS: Fix for MENU_InsertItem (add if menu item not found)

File:

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

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.25 2000-10-22 19:53:23 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.26 2000-11-01 20:51:37 sandervl Exp $*/
 /*
  * Menu functions
@@ -1867 +1867 @@
     /* Find where to insert new item */
 
-    if ((pos==(UINT)-1) || ((flags & MF_BYPOSITION) && (pos == menu->nItems)))
-    {
-        /* Special case: append to menu */
-        /* Some programs specify the menu length to do that */
-        pos = menu->nItems;
-    } else
-    {
-        if (!MENU_FindItem( &hMenu, &pos, flags ))
-        {
-            //FIXME("item %x not found\n", pos );
-            return NULL;
-        }
-        if (!(menu = MENU_GetMenu(hMenu)))
-            return NULL;
+    /* Find where to insert new item */
+
+    if (flags & MF_BYPOSITION) {
+        if (pos > menu->nItems) 
+            pos = menu->nItems;
+    } else {
+        if (!MENU_FindItem( &hMenu, &pos, flags )) 
+            pos = menu->nItems;
+        else {
+            if (!(menu = MENU_GetMenu( hMenu )))
+                return NULL;
+        }
     }