consolidate context-menu popup methods

8 files changed, 17 insertions, 57 deletions

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 2ed98cfad5..0d08c6ea87 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -559,16 +559,6 @@ EditorRoutes::build_menu ()
 }
 
 void
-EditorRoutes::show_menu ()
-{
-	if (_menu == 0) {
-		build_menu ();
-	}
-
-	_menu->popup (1, gtk_get_current_event_time());
-}
-
-void
 EditorRoutes::redisplay_real ()
 {
 	TreeModel::Children rows = _model->children();
@@ -1472,7 +1462,10 @@ bool
 EditorRoutes::button_press (GdkEventButton* ev)
 {
 	if (Keyboard::is_context_menu_event (ev)) {
-		show_menu ();
+		if (_menu == 0) {
+			build_menu ();
+		}
+		_menu->popup (ev->button, ev->time);
 		return true;
 	}
 
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index e1bf61e82e..a9d7115fdf 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -77,7 +77,6 @@ private:
 	void on_tv_solo_isolate_toggled (std::string const &);
 	void on_tv_solo_safe_toggled (std::string const &);
 	void build_menu ();
-	void show_menu ();
 	void presentation_info_changed (PBD::PropertyChange const &);
 	void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
 	void row_deleted (Gtk::TreeModel::Path const &);
diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc
index 653c3c40b0..09506066f8 100644
--- a/gtk2_ardour/mini_timeline.cc
+++ b/gtk2_ardour/mini_timeline.cc
@@ -562,21 +562,15 @@ MiniTimeline::build_minitl_context_menu ()
 	}
 }
 
-void
-MiniTimeline::show_minitl_context_menu ()
-{
-	if (_minitl_context_menu == 0) {
-		build_minitl_context_menu ();
-	}
-	_minitl_context_menu->popup (1, gtk_get_current_event_time());
-}
-
 bool
 MiniTimeline::on_button_press_event (GdkEventButton *ev)
 {
 	if (Gtkmm2ext::Keyboard::is_context_menu_event (ev)) {
 		if (_session) {
-			show_minitl_context_menu ();
+			if (_minitl_context_menu == 0) {
+				build_minitl_context_menu ();
+			}
+			_minitl_context_menu->popup (ev->button, ev->time);
 		}
 		return true;
 	}
diff --git a/gtk2_ardour/mini_timeline.h b/gtk2_ardour/mini_timeline.h
index 262b1adad2..c6dea5326b 100644
--- a/gtk2_ardour/mini_timeline.h
+++ b/gtk2_ardour/mini_timeline.h
@@ -77,7 +77,6 @@ private:
 	bool on_leave_notify_event (GdkEventCrossing*);
 
 	void build_minitl_context_menu ();
-	void show_minitl_context_menu ();
 	void set_span (ARDOUR::framecnt_t);
 
 	Glib::RefPtr<Pango::Layout> _layout;
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 6c7a72ca14..a6aa36e641 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -375,6 +375,7 @@ Mixer_UI::~Mixer_UI ()
 		delete _monitor_section;
 	}
 	delete _plugin_selector;
+	delete track_menu;
 }
 
 void
@@ -1549,21 +1550,14 @@ Mixer_UI::initial_track_display ()
 	sync_treeview_from_presentation_info (Properties::order);
 }
 
-void
-Mixer_UI::show_track_list_menu ()
-{
-	if (track_menu == 0) {
-		build_track_menu ();
-	}
-
-	track_menu->popup (1, gtk_get_current_event_time());
-}
-
 bool
 Mixer_UI::track_display_button_press (GdkEventButton* ev)
 {
 	if (Keyboard::is_context_menu_event (ev)) {
-		show_track_list_menu ();
+		if (track_menu == 0) {
+			build_track_menu ();
+		}
+		track_menu->popup (ev->button, ev->time);
 		return true;
 	}
 	if ((ev->type == GDK_BUTTON_PRESS) && (ev->button == 1)) {
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h
index be557ec018..413c8be727 100644
--- a/gtk2_ardour/mixer_ui.h
+++ b/gtk2_ardour/mixer_ui.h
@@ -239,7 +239,6 @@ class Mixer_UI : public Gtkmm2ext::Tabbable, public PBD::ScopedConnectionList, p
 	ARDOUR::PluginPresetPtr selected_plugin ();
 
 	void initial_track_display ();
-	void show_track_list_menu ();
 
 	void set_all_strips_visibility (bool yn);
 	void set_all_audio_midi_visibility (int, bool);
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index e205c4ddd8..010ac2d119 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -256,16 +256,6 @@ ShuttleControl::build_shuttle_context_menu ()
 }
 
 void
-ShuttleControl::show_shuttle_context_menu ()
-{
-	if (shuttle_context_menu == 0) {
-		build_shuttle_context_menu ();
-	}
-
-	shuttle_context_menu->popup (1, gtk_get_current_event_time());
-}
-
-void
 ShuttleControl::reset_speed ()
 {
 	if (_session->transport_rolling()) {
@@ -295,7 +285,10 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev)
 	}
 
 	if (Keyboard::is_context_menu_event (ev)) {
-		show_shuttle_context_menu ();
+		if (shuttle_context_menu == 0) {
+			build_shuttle_context_menu ();
+		}
+		shuttle_context_menu->popup (ev->button, ev->time);
 		return true;
 	}
 
@@ -668,15 +661,6 @@ ShuttleControl::render (cairo_t* cr, cairo_rectangle_t*)
 }
 
 void
-ShuttleControl::shuttle_unit_clicked ()
-{
-	if (shuttle_unit_menu == 0) {
-		shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
-	}
-	shuttle_unit_menu->popup (1, gtk_get_current_event_time());
-}
-
-void
 ShuttleControl::set_shuttle_style (ShuttleBehaviour s)
 {
 	Config->set_shuttle_behaviour (s);
diff --git a/gtk2_ardour/shuttle_control.h b/gtk2_ardour/shuttle_control.h
index 74b837fdc7..62a55ab846 100644
--- a/gtk2_ardour/shuttle_control.h
+++ b/gtk2_ardour/shuttle_control.h
@@ -82,9 +82,7 @@ protected:
 	BindingProxy      binding_proxy;
 	float bg_r, bg_g, bg_b;
 	void build_shuttle_context_menu ();
-	void show_shuttle_context_menu ();
 	void shuttle_style_changed();
-	void shuttle_unit_clicked ();
 	void set_shuttle_max_speed (float);
 	void reset_speed ();