making things compile and build again ...

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 51fa71566cbdfef088f762cfe4b8035b8126d833..a4e6ec9e1aef3d1e6db4b60217998764967c62b9 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -33,7 +33,7 @@
 // FIXME: is this right? somehow I don't think so (VZ)
 
 #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
-//#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
+#define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
 //#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
 
 #define ACCEL_OBJECT        GtkWindow
@@ -239,6 +239,11 @@ static void wxMenubarUnsetInvokingWindow( wxMenu *menu, wxWindow *win )
     while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
         top_frame = top_frame->GetParent();
 
+    // support for native hot keys
+    ACCEL_OBJECT *obj = ACCEL_OBJ_CAST(top_frame->m_widget);
+    if ( menu->m_accel && g_slist_find( ACCEL_OBJECTS(menu->m_accel), obj ) )
+        gtk_accel_group_detach( menu->m_accel, obj );
+
     wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
     while (node)
     {
@@ -446,8 +451,11 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 
         if( frame )
             frame->UpdateMenuBarSize();
+        
+        wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
     }
 
+    
     return menu;
 }
 
@@ -747,10 +755,6 @@ wxMenuItem::~wxMenuItem()
 // return the menu item text without any menu accels
 /* static */
 
-// TODO: this is now wrong, because it will be used by public APIs
-// to convert from label-with-wxWidgets-hotkeys to plain text,
-// and this function converts from GTK+ hotkeys to plain text.
-
 wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     // The argument to this function will now always be in wxWidgets standard label
@@ -800,7 +804,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
 
 wxString wxMenuItem::GetItemLabel() const
 {
-    return wxConvertFromGTKToWXLabel(m_text);
+    wxString label = wxConvertFromGTKToWXLabel(m_text);
+    if (!m_hotKey.IsEmpty())
+        label = label + wxT("\t") + m_hotKey;
+    return label;
 }
 
 void wxMenuItem::SetItemLabel( const wxString& str )
@@ -1050,8 +1057,6 @@ void wxMenu::Init()
 
 wxMenu::~wxMenu()
 {
-   WX_CLEAR_LIST(wxMenuItemList, m_items);
-
    if ( GTK_IS_WIDGET( m_menu ))
    {
        // see wxMenu::Init
@@ -1063,6 +1068,13 @@ wxMenu::~wxMenu()
        if ( m_owner )
            gtk_widget_destroy( m_menu );
    }
+   
+   // This must come after we release GTK resources above. Otherwise, GTK will 
+   // give warnings/errors when attempting to free accelerator resources from 
+   // child items that just were destroyed (the m_menu widget can contain 
+   // references to accelerators in child items. Problem detected when removing 
+   // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.) 
+   WX_CLEAR_LIST(wxMenuItemList, m_items);
 }
 
 void wxMenu::SetLayoutDirection(const wxLayoutDirection dir)
@@ -1082,7 +1094,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     GtkWidget *menuItem;
 
     // cache some data used later
-    wxString text = mitem->GetItemLabel();
+    wxString text = mitem->wxMenuItemBase::GetItemLabel();
     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;