more framework fixes for menu displays

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

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 573be47fd8e0a0b2e909fb8c1ec7f43528fa7f29..5c17e2c98579cff188ab1f4ec6192c48f3996830 100644 (file)
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -317,6 +317,9 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !GtkAppend(menu, title) )
         return FALSE;
 
+    if (pos+1 >= m_menus.GetCount())
+        return TRUE;
+
     GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
     gpointer data = g_list_last(menu_shell->children)->data;
     menu_shell->children = g_list_remove(menu_shell->children, data);
@@ -335,9 +338,6 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
-    if ( !wxMenuBarBase::Replace(pos, menu, title) )
-        return (wxMenu*) NULL;
-
     // remove the old item and insert a new one
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
@@ -641,9 +641,10 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 #if (GTK_MINOR_VERSION > 0)
     for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
-        if ( *pc == wxT('_') )
+        if ( *pc == wxT('_') || *pc == wxT('&') )
         {
-            // this is the escape character for GTK+ - skip it
+            // '_' is the escape character for GTK+ and '&' is the one for
+            // wxWindows - skip both of them
             continue;
         }
 
@@ -871,6 +872,12 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
 #endif // GTK 1.2/1.0
 
         gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
+
+        // if adding a submenu to a menu already existing in the menu bar, we
+        // must set invoking window to allow processing events from this
+        // submenu
+        if ( m_invokingWindow )
+            wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
     }
     else // a normal item
     {