Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / os2 / menu.cpp

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index e93d89adc4053be542bcb81d4aa1cab4a81dde02..587a60a854e9984085f4ef69221eb710eee82c34 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -244,7 +244,7 @@ void wxMenu::UpdateAccel(
         if (pAccel)
             m_vAccels[n] = pAccel;
         else
-            m_vAccels.Remove(n);
+            m_vAccels.RemoveAt(n);
     }
 
     if (IsAttached())
@@ -448,7 +448,7 @@ wxMenuItem* wxMenu::DoRemove(
     if (n != wxNOT_FOUND)
     {
         delete m_vAccels[n];
-        m_vAccels.Remove(n);
+        m_vAccels.RemoveAt(n);
     }
 
 #endif // wxUSE_ACCEL
@@ -609,7 +609,12 @@ wxMenuItem* wxMenu::FindItem(
         }
         else if ( pItem->IsSubMenu() )
         {
-            pItem = pItem->GetSubMenu()->FindItem(nItemId, hItem, ppItemMenu);
+            pItem = pItem->GetSubMenu()->FindItem( nItemId
+                                                  ,hItem
+                                                  ,ppItemMenu
+                                                 );
+            if (pItem)
+                break;
         }
         else
         {
@@ -929,7 +934,6 @@ bool wxMenuBar::Append(
     if (!wxMenuBarBase::Append(pMenu, Title))
         return FALSE;
 
-    pMenu->Attach(this);
     m_titles.Add(Title);
 
     if ( IsAttached() )