From 180528a72e66d1e6eb9a604dac274709a347a094 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 31 May 2012 01:11:59 +0100 Subject: Tidy up deprecated Gtkmm menu stuff (bzr r11440) --- src/ui/dialog/scriptdialog.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/ui/dialog/scriptdialog.cpp') 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); -- cgit v1.2.3