Tidy up deprecated Gtkmm menu stuff

(bzr r11440)

4 files changed, 21 insertions, 54 deletions

diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp
index d6077a436..a026f3501 100644
--- a/src/ui/dialog/debug.cpp
+++ b/src/ui/dialog/debug.cpp
@@ -72,12 +72,11 @@ DebugDialogImpl::DebugDialogImpl()
     Gtk::Box *mainVBox = get_vbox();
 
     //## Add a menu for clear()
-#if WITH_GTKMM_3_0
-    Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File")));
+    Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"), true));
     item->set_submenu(fileMenu);
     menuBar.append(*item);
 
-    item = Gtk::manage(new Gtk::MenuItem(_("_Clear")));
+    item = Gtk::manage(new Gtk::MenuItem(_("_Clear"), true));
     item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::clear));
     fileMenu.append(*item);
 
@@ -88,15 +87,6 @@ DebugDialogImpl::DebugDialogImpl()
     item = Gtk::manage(new Gtk::MenuItem(_("Release log messages")));
     item->signal_activate().connect(sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages));
     fileMenu.append(*item);
-#else
-    menuBar.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_File"), fileMenu) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Clear"),
-           sigc::mem_fun(*this, &DebugDialogImpl::clear) ) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("Capture log messages"),
-           sigc::mem_fun(*this, &DebugDialogImpl::captureLogMessages) ) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("Release log messages"),
-           sigc::mem_fun(*this, &DebugDialogImpl::releaseLogMessages) ) );
-#endif
 
     mainVBox->pack_start(menuBar, Gtk::PACK_SHRINK);
     
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 4af328b49..8d433b880 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -19,6 +19,7 @@
 #endif
 
 #include "dialog-manager.h"
+#include <gtkmm/imagemenuitem.h>
 #include "ui/widget/spinbutton.h"
 #include <glibmm/i18n.h>
 
@@ -1103,8 +1104,12 @@ Glib::RefPtr<Gtk::Menu> create_popup_menu(Gtk::Widget& parent, sigc::slot<void>
 {
     Glib::RefPtr<Gtk::Menu> menu(new Gtk::Menu);
 
-    menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Duplicate"), dup));
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Duplicate"),true));
+    mi->signal_activate().connect(dup);
+    mi->show();
+    menu->append(*mi);
+    
+    mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
     menu->append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
@@ -1147,8 +1152,11 @@ FilterEffectsDialog::FilterModifier::FilterModifier(FilterEffectsDialog& d)
         sigc::mem_fun(*this, &FilterModifier::filter_list_button_release));
     _menu = create_popup_menu(*this, sigc::mem_fun(*this, &FilterModifier::duplicate_filter),
                               sigc::mem_fun(*this, &FilterModifier::remove_filter));
-    _menu->items().push_back(Gtk::Menu_Helpers::MenuElem(
-                                 _("R_ename"), sigc::mem_fun(*this, &FilterModifier::rename_filter)));
+    
+    Gtk::MenuItem *item = Gtk::manage(new Gtk::MenuItem(_("R_ename"), true));
+    item->signal_activate().connect(sigc::mem_fun(*this, &FilterModifier::rename_filter));    
+    item->show();
+    _menu->append(*item);
     _menu->accelerate(*this);
 
     _list.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &FilterModifier::on_filter_selection_changed));
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index b3cef7122..0a6900066 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -16,11 +16,8 @@
 #include "layers.h"
 #include <gtkmm/widget.h>
 #include <gtkmm/icontheme.h>
-
-#if WITH_GTKMM_3_0
 #include <gtkmm/imagemenuitem.h>
 #include <gtkmm/separatormenuitem.h>
-#endif
 
 #include <glibmm/i18n.h>
 
@@ -148,30 +145,18 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code
     }
 
 
-#if WITH_GTKMM_3_0
     Gtk::MenuItem* item = 0;
 
     if (wrapped) {
-        item = Gtk::manage(new Gtk::ImageMenuItem(*wrapped, label));
+        item = Gtk::manage(new Gtk::ImageMenuItem(*wrapped, label, true));
     } else {
-	item = Gtk::manage(new Gtk::MenuItem(label));
+	item = Gtk::manage(new Gtk::MenuItem(label, true));
     }
 
     item->signal_activate().connect(sigc::bind(sigc::mem_fun(*this, &LayersPanel::_takeAction), id));
     _popupMenu.append(*item);
 
     return *item;
-#else
-    Gtk::Menu::MenuList& menulist = _popupMenu.items();
-
-    if ( wrapped ) {
-        menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem( label, *wrapped, sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), id)) );
-    } else {
-        menulist.push_back( Gtk::Menu_Helpers::MenuElem( label, sigc::bind( sigc::mem_fun(*this, &LayersPanel::_takeAction), id)) );
-    }
-    
-    return menulist.back();
-#endif
 }
 
 void LayersPanel::_fireAction( unsigned int code )
@@ -729,12 +714,8 @@ LayersPanel::LayersPanel() :
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_NEW, 0, "New", (int)BUTTON_NEW ) );
         _watching.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_SOLO, 0, "Solo", (int)BUTTON_SOLO ) );
 
-#if WITH_GTKMM_3_0
 	Gtk::MenuItem* item = Gtk::manage(new Gtk::SeparatorMenuItem());
         _popupMenu.append(*item);
-#else
-        _popupMenu.items().push_back( Gtk::Menu_Helpers::SeparatorElem() );
-#endif
 
         _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_RAISE, GTK_STOCK_GO_UP, "Up", (int)BUTTON_UP ) );
         _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_LAYER_LOWER, GTK_STOCK_GO_DOWN, "Down", (int)BUTTON_DOWN ) );
diff --git a/src/ui/dialog/scriptdialog.cpp b/src/ui/dialog/scriptdialog.cpp
index eeb4a5b82..87794a3ce 100644
--- a/src/ui/dialog/scriptdialog.cpp
+++ b/src/ui/dialog/scriptdialog.cpp
@@ -175,37 +175,25 @@ ScriptDialogImpl::ScriptDialogImpl() :
     Gtk::Box *contents = _getContents();
 
     //## Add a menu for clear()
-#if WITH_GTKMM_3_0
-    Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("File")));
+    Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("File"), true));
     item->set_submenu(fileMenu);
     menuBar.append(*item);
 
-    item = Gtk::manage(new Gtk::MenuItem(_("_Clear")));
+    item = Gtk::manage(new Gtk::MenuItem(_("_Clear"), true));
     item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::clear));
     fileMenu.append(*item);
     
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Javascript")));
+    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Javascript"), true));
     item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executeJavascript));
     fileMenu.append(*item);
     
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Python")));
+    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Python"), true));
     item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executePython));
     fileMenu.append(*item);
     
-    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Ruby")));
+    item = Gtk::manage(new Gtk::MenuItem(_("_Execute Ruby"), true));
     item->signal_activate().connect(sigc::mem_fun(*this, &ScriptDialogImpl::executeRuby));
     fileMenu.append(*item);
-#else
-    menuBar.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_File"), fileMenu) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Clear"),
-           sigc::mem_fun(*this, &ScriptDialogImpl::clear) ) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Execute Javascript"),
-           sigc::mem_fun(*this, &ScriptDialogImpl::executeJavascript) ) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Execute Python"),
-           sigc::mem_fun(*this, &ScriptDialogImpl::executePython) ) );
-    fileMenu.items().push_back( Gtk::Menu_Helpers::MenuElem(_("_Execute Ruby"),
-           sigc::mem_fun(*this, &ScriptDialogImpl::executeRuby) ) );
-#endif
     
     contents->pack_start(menuBar, Gtk::PACK_SHRINK);