X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03ec224dcde69ee0b30f5baecc4b5e5466b02c1..300b1288331acc7ac3482595bb226a52f8aec238:/src/gtk/menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index b7f1643856..20fce15bf0 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -328,13 +328,13 @@ 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 FALSE;
+        return (wxMenu*) NULL;
 
     // remove the old item and insert a new one
     wxMenu *menuOld = Remove(pos);
     if ( menuOld && !Insert(pos, menu, title) )
     {
-        return NULL;
+        return (wxMenu*) NULL;
     }
 
     // either Insert() succeeded or Remove() failed and menuOld is NULL
@@ -345,35 +345,23 @@ wxMenu *wxMenuBar::Remove(size_t pos)
 {
     wxMenu *menu = wxMenuBarBase::Remove(pos);
     if ( !menu )
-        return FALSE;
+        return (wxMenu*) NULL;
 
-#ifdef __WXGTK12__
-    // gtk_item_factory_delete_entry() is buggy as of GTK+ 1.2.6, so don't use
-    // it but delete the widget manually instead
-    wxString path = _T("<main>/"),
-             title = menu->GetTitle();
-    for ( const wxChar *p = title.c_str(); *p; p++ )
-    {
-        if ( *p != _T('_') )
-            path += *p;
-    }
-
-    GtkWidget *widget = gtk_item_factory_get_item(m_factory, path.mb_str());
-    if ( widget )
-    {
-        gtk_widget_destroy(widget);
-
-        return menu;
-    }
-
-    // shouldn't happen (FIXME but does now)
-    wxFAIL_MSG( _T("gtk_item_factory_get_item() failed") );
-#else // GTK < 1.2
-    // this should be very simple to implement
-    wxFAIL_MSG( wxT("TODO") );
-#endif // GTK 1.2/1.0
-
-    return NULL;
+    GtkMenuShell *menu_shell = GTK_MENU_SHELL(m_factory->widget);
+    printf( "factory entries before %d\n", (int)g_slist_length(m_factory->items) );
+    printf( "menu shell entries before %d\n", (int)g_list_length( menu_shell->children ) );
+    
+    // unparent calls unref() and that would delete the widget so we raise
+    // the ref count to 2 artificially before invoking unparent.
+    gtk_widget_ref( menu->m_menu );
+    gtk_widget_unparent( menu->m_menu );
+    
+    gtk_widget_destroy( menu->m_owner );
+    
+    printf( "factory entries after %d\n", (int)g_slist_length(m_factory->items) );
+    printf( "menu shell entries after %d\n", (int)g_list_length( menu_shell->children ) );
+    
+    return menu;
 }
 
 static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString, const wxString &itemString )
@@ -820,7 +808,7 @@ wxMenu::~wxMenu()
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
-bool wxMenu::DoAppend(wxMenuItem *mitem)
+bool wxMenu::GtkAppend(wxMenuItem *mitem)
 {
     GtkWidget *menuItem;
 
@@ -934,56 +922,36 @@ bool wxMenu::DoAppend(wxMenuItem *mitem)
 
     mitem->SetMenuItem(menuItem);
 
-    return wxMenuBase::DoAppend(mitem);
+    return TRUE;
 }
 
-// VZ: this seems to be GTK+ 1.0 only code, I don't understand why there were
-//     both specialized versions of Append() and this one before my changes,
-//     but it seems that the others are better...
-#if 0
-void wxMenu::Append( wxMenuItem *item )
+bool wxMenu::DoAppend(wxMenuItem *mitem)
 {
-    GtkWidget *menuItem = (GtkWidget*) NULL;
-
-    if (item->IsSeparator())
-        menuItem = gtk_menu_item_new();
-    else if (item->IsSubMenu())
-        menuItem = gtk_menu_item_new_with_label(item->GetText().mbc_str());
-    else
-        menuItem = item->IsCheckable() ? gtk_check_menu_item_new_with_label(item->GetText().mbc_str())
-                                       : gtk_menu_item_new_with_label(item->GetText().mbc_str());
-
-    if (!item->IsSeparator())
-    {
-        gtk_signal_connect( GTK_OBJECT(menuItem), "select",
-                            GTK_SIGNAL_FUNC(gtk_menu_hilight_callback),
-                            (gpointer*)this );
-
-        gtk_signal_connect( GTK_OBJECT(menuItem), "deselect",
-                            GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
-                            (gpointer*)this );
-
-        if (!item->IsSubMenu())
-        {
-            gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
-                                GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
-                                (gpointer*)this );
-        }
-    }
-
-    gtk_menu_append( GTK_MENU(m_menu), menuItem );
-    gtk_widget_show( menuItem );
-
-    item->SetMenuItem(menuItem);
+    return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
 }
-#endif // 0
 
 bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
 {
     if ( !wxMenuBase::DoInsert(pos, item) )
         return FALSE;
 
-    wxFAIL_MSG(wxT("not implemented"));
+#ifdef __WXGTK12__
+    // GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
+    // of version 1.2.6), so we first append the item and then change its
+    // index
+    if ( !GtkAppend(item) )
+        return FALSE;
+
+    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);
+    menu_shell->children = g_list_insert(menu_shell->children, data, pos);
+
+    return TRUE;
+#else // GTK < 1.2
+    // this should be easy to do...
+    wxFAIL_MSG( wxT("not implemented") );
+#endif // GTK 1.2/1.0
 
     return FALSE;
 }