[Emerge-svn] SF.net SVN: emerge: [1802] trunk/Source/emergeDesktop/MenuBuilder.cpp

[<ir0...@us...>]

Revision: 1802
          http://emerge.svn.sourceforge.net/emerge/?rev=1802&view=rev
Author:   ir0nh34d
Date:     2008-05-24 03:53:11 -0700 (Sat, 24 May 2008)

Log Message:
-----------
Remove unecessary check

Modified Paths:
--------------
    trunk/Source/emergeDesktop/MenuBuilder.cpp

Modified: trunk/Source/emergeDesktop/MenuBuilder.cpp
===================================================================
--- trunk/Source/emergeDesktop/MenuBuilder.cpp	2008-05-24 01:12:09 UTC (rev 1801)
+++ trunk/Source/emergeDesktop/MenuBuilder.cpp	2008-05-24 10:53:11 UTC (rev 1802)
@@ -194,12 +194,13 @@
   bool subMenu = (SelectedItemType & MF_POPUP) == MF_POPUP;
   WCHAR value[MAX_LINE_LENGTH];
 
-  itemID--;
-
   if (subMenu)
-    menu = GetSubMenu(SelectedMenu, SelectedItem);
+    menu = GetSubMenu(SelectedMenu, itemID);
   else
-    menu = SelectedMenu;
+    {
+      menu = SelectedMenu;
+      itemID--;
+    }
 
   iter = menuMap.find(menu);
   if (iter == menuMap.end())
@@ -256,17 +257,6 @@
 
 LRESULT MenuBuilder::DoMenuSelect(HMENU menu, WORD itemType, WORD item)
 {
-  MenuMap::iterator iter;
-
-  iter = menuMap.find(menu);
-
-  if (iter == menuMap.end())
-    {
-      iter = menuMapMid.find(menu);
-      if (iter == menuMapMid.end())
-        return 0;
-    }
-
   SelectedMenu = menu;
   SelectedItem = item;
   SelectedItemType = itemType;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.