wxDbGrid additions

[wxWidgets.git] / src / common / menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 86b13483796a482c63a01dab24417fb765d7d8e3..d003b79a66da60d316af5c004bdac7994dfc5468 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -266,7 +266,10 @@ int wxMenuBase::FindItem(const wxString& text) const
             if ( rc != wxNOT_FOUND )
                 return rc;
         }
             if ( rc != wxNOT_FOUND )
                 return rc;
         }

-        else if ( !item->IsSeparator() )
+
+        // we execute this code for submenus as well to alllow finding them by
+        // name just like the ordinary items
+        if ( !item->IsSeparator() )

         {
             if ( item->GetLabel() == label )
                 return item->GetId();
         {
             if ( item->GetLabel() == label )
                 return item->GetId();


@@ -501,7 +504,7 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
 {
     if ( pos == m_menus.GetCount() )
     {
 {
     if ( pos == m_menus.GetCount() )
     {

-        return Append(menu, title);
+        return wxMenuBarBase::Append(menu, title);

     }
     else
     {
     }
     else
     {