X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ab6adfedf92aa4457821422e77c19b80f10bee..c07c37d70a4e93bfbaee1727795e389b775c2ea0:/src/gtk1/menu.cpp

diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index cc8b6b0e0c..e30e13f7b8 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -21,8 +21,8 @@
     #include "wx/accel.h"
 #endif // wxUSE_ACCEL
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -78,6 +78,8 @@ wxMenuBar::wxMenuBar( long style )
     }
 
     PostCreation();
+
+    ApplyWidgetStyle();
 }
 
 wxMenuBar::wxMenuBar()
@@ -108,6 +110,8 @@ wxMenuBar::wxMenuBar()
     m_widget = GTK_WIDGET(m_menubar);
 
     PostCreation();
+
+    ApplyWidgetStyle();
 }
 
 wxMenuBar::~wxMenuBar()
@@ -205,8 +209,14 @@ void wxMenuBar::UnsetInvokingWindow( wxWindow *win )
 
 bool wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
-    m_menus.Append( menu );
+    if ( !wxMenuBarBase::Append( menu, title ) )
+        return FALSE;
 
+    return GtkAppend(menu, title);
+}
+
+bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title)
+{
     const wxChar *pc;
 
     /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
@@ -296,29 +306,71 @@ bool wxMenuBar::Insert(size_t pos, wxMenu *menu, const wxString& title)
     if ( !wxMenuBarBase::Insert(pos, menu, title) )
         return FALSE;
 
-    wxFAIL_MSG(wxT("TODO"));
+#if __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(menu, title) )
+        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 with GTK 1.0 - can use standard functions for
+    // this and don't need any hacks like above, but as I don't have GTK 1.0
+    // any more I can't do it
+    wxFAIL_MSG( wxT("TODO") );
 
     return FALSE;
+#endif // GTK 1.2/1.0
 }
 
 wxMenu *wxMenuBar::Replace(size_t pos, wxMenu *menu, const wxString& title)
 {
     if ( !wxMenuBarBase::Replace(pos, menu, title) )
-        return FALSE;
+        return (wxMenu*) NULL;
 
-    wxFAIL_MSG(wxT("TODO"));
+    // remove the old item and insert a new one
+    wxMenu *menuOld = Remove(pos);
+    if ( menuOld && !Insert(pos, menu, title) )
+    {
+        return (wxMenu*) NULL;
+    }
 
-    return NULL;
+    // either Insert() succeeded or Remove() failed and menuOld is NULL
+    return menuOld;
 }
 
 wxMenu *wxMenuBar::Remove(size_t pos)
 {
-    if ( !wxMenuBarBase::Remove(pos) )
-        return FALSE;
+    wxMenu *menu = wxMenuBarBase::Remove(pos);
+    if ( !menu )
+        return (wxMenu*) 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 ) );
+*/
 
-    wxFAIL_MSG(wxT("TODO"));
+    // 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 );
 
-    return NULL;
+    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 )
@@ -469,11 +521,13 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
     event.SetEventObject( menu );
     event.SetInt(id );
 
+#if wxUSE_MENU_CALLBACK
     if (menu->GetCallback())
     {
         (void) (*(menu->GetCallback())) (*menu, event);
         return;
     }
+#endif // wxUSE_MENU_CALLBACK
 
     if (menu->GetEventHandler()->ProcessEvent(event))
         return;
@@ -576,11 +630,12 @@ wxMenuItem::~wxMenuItem()
 }
 
 // return the menu item text without any menu accels
-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
     wxString label;
 #if (GTK_MINOR_VERSION > 0)
-    for ( const wxChar *pc = m_text.c_str(); *pc; pc++ )
+    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
     {
         if ( *pc == wxT('_') )
         {
@@ -591,7 +646,7 @@ wxString wxMenuItem::GetLabel() const
         label += *pc;
     }
 #else // GTK+ 1.0
-    label = m_text;
+    label = text;
 #endif // GTK+ 1.2/1.0
 
     return label;
@@ -703,7 +758,8 @@ bool wxMenuItem::IsChecked() const
 
 wxString wxMenuItem::GetFactoryPath() const
 {
-    /* in order to get the pointer to the item we need the item text _without_ underscores */
+    /* in order to get the pointer to the item we need the item text _without_
+       underscores */
     wxString path( wxT("<main>/") );
     path += GetLabel();
 
@@ -756,13 +812,13 @@ void wxMenu::Init()
 wxMenu::~wxMenu()
 {
    m_items.Clear();
- 
+
    gtk_widget_destroy( m_menu );
 
    gtk_object_unref( GTK_OBJECT(m_factory) );
 }
 
-bool wxMenu::DoAppend(wxMenuItem *mitem)
+bool wxMenu::GtkAppend(wxMenuItem *mitem)
 {
     GtkWidget *menuItem;
 
@@ -876,58 +932,38 @@ 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") );
 
     return FALSE;
+#endif // GTK 1.2/1.0
 }
 
 wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)