X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change.cc;h=739cda4702d431d5275c3c2801d870f4aae0403f;hb=af103cf3c23596d97091d857f98c283c943f3a21;hp=fb3507ae6454dbb3a2c4dc69bcc43930a502fffe;hpb=176625d9e0dbe53c9f5628d172ee6f5488be8202;p=ardour.git

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index fb3507ae64..739cda4702 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -24,6 +24,7 @@
 #include <glibmm/regex.h>
 
 #include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/menu_elems.h"
 #include "gtkmm2ext/utils.h"
 
 #include "midi++/midnam_patch.h"
@@ -50,8 +51,8 @@ PatchChange::PatchChange(MidiRegionView&                   region,
                          double                            y,
                          ARDOUR::InstrumentInfo&           info,
                          ARDOUR::MidiModel::PatchChangePtr patch,
-			 ArdourCanvas::Color               outline_color,
-			 ArdourCanvas::Color               fill_color)
+			 Gtkmm2ext::Color               outline_color,
+			 Gtkmm2ext::Color               fill_color)
 	: _region (region)
 	, _info (info)
 	, _patch (patch)
@@ -137,14 +138,8 @@ PatchChange::initialize_popup_menus()
 		for (PatchNameList::const_iterator patch = patches.begin();
 		     patch != patches.end();
 		     ++patch) {
-			std::string name = (*patch)->name();
-			boost::replace_all (name, "_", " ");
-
-			patch_menus.push_back (
-				Gtk::Menu_Helpers::MenuElem (
-					name,
-					sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected),
-					            (*patch)->patch_primary_key())));
+			patch_menus.push_back (Gtkmm2ext::MenuElemNoMnemonic ((*patch)->name(),
+						sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key())));
 		}
 	}
 }