patch from brian to get consistent menu behaviour

git-svn-id: svn://localhost/ardour2/trunk@1155 d708f5d6-7413-0410-9779-e7cbd77b26cf

10 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 25fe144233..27b852982a 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -609,7 +609,7 @@ ARDOUR_UI::show_shuttle_context_menu ()
 		build_shuttle_context_menu ();
 	}
 
-	shuttle_context_menu->popup (1, 0);
+	shuttle_context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -815,7 +815,7 @@ ARDOUR_UI::shuttle_unit_clicked ()
 	if (shuttle_unit_menu == 0) {
 		shuttle_unit_menu = dynamic_cast<Menu*> (ActionManager::get_widget ("/ShuttleUnitPopup"));
 	}
-	shuttle_unit_menu->popup (1, 0);
+	shuttle_unit_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 50a2fc9b08..424564f18b 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -192,7 +192,7 @@ AutomationTimeAxisView::auto_clicked ()
 					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
 	}
 
-	automation_menu->popup (1, 0);
+	automation_menu->popup (1, gtk_get_current_event_time());
 }
 
 
diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc
index 8df76fef25..2ee1773646 100644
--- a/gtk2_ardour/editor_edit_groups.cc
+++ b/gtk2_ardour/editor_edit_groups.cc
@@ -119,7 +119,7 @@ Editor::edit_group_list_button_press_event (GdkEventButton* ev)
 		if (edit_group_list_menu == 0) {
 			build_edit_group_list_menu ();
 		}
-		edit_group_list_menu->popup (1, 0);
+		edit_group_list_menu->popup (1, ev->time);
 		return true;
 	}
 
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 3e2f130691..bad0854885 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -470,7 +470,7 @@ Editor::show_route_list_menu()
 		build_route_list_menu ();
 	}
 
-	route_list_menu->popup (1, 0);
+	route_list_menu->popup (1, gtk_get_current_event_time());
 }
 
 bool
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index d42ebf1e7f..ee0ba1d024 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -421,7 +421,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t)
  		mitem->set_active(true);
  	}
 	
-        editor_ruler_menu->popup (1, 0);
+        editor_ruler_menu->popup (1, gtk_get_current_event_time());
 
 	no_ruler_shown_update = false;
 }
diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
index b1f193b862..a8be71e85e 100644
--- a/gtk2_ardour/ladspa_pluginui.cc
+++ b/gtk2_ardour/ladspa_pluginui.cc
@@ -579,7 +579,7 @@ LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
 	items.push_back (MenuElem (_("Touch"),
 				   bind (mem_fun(*this, &LadspaPluginUI::set_automation_state), (AutoState) Touch, cui)));
 
-	automation_menu->popup (1, 0);
+	automation_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index d8e5fc6988..d983689e31 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -656,7 +656,7 @@ Mixer_UI::show_track_list_menu ()
 		build_track_menu ();
 	}
 
-	track_menu->popup (1, 0);
+	track_menu->popup (1, gtk_get_current_event_time());
 }
 
 bool
@@ -765,7 +765,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
 		if (mix_group_context_menu == 0) {
 			build_mix_group_context_menu ();
 		}
-		mix_group_context_menu->popup (1, 0);
+		mix_group_context_menu->popup (1, ev->time);
 		return true;
 	}
 
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 1fb94a1321..1e6e4c16c9 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -593,7 +593,7 @@ Panner2d::show_context_menu ()
 	} 
 
 	bypass_menu_item->set_active (panner.bypassed());
-	context_menu->popup (1, 0);
+	context_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index 5f61b0528c..033537f842 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -510,7 +510,7 @@ RouteParams_UI::show_track_menu()
 				(MenuElem (_("Add Track/Bus"), 
 					   mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
 	}
-	track_menu->popup (1, 0);
+	track_menu->popup (1, gtk_get_current_event_time());
 }
 
 
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a616941fe9..cc51444d43 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -358,7 +358,7 @@ RouteTimeAxisView::playlist_click ()
 	
  	build_playlist_menu (playlist_action_menu);
 	editor.set_selected_track (*this, Selection::Add);
-	playlist_action_menu->popup (1, 0);
+	playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -371,7 +371,7 @@ RouteTimeAxisView::automation_click ()
 		build_display_menu ();
 	}
 	editor.set_selected_track (*this, Selection::Add);
-	automation_action_menu->popup (1, 0);
+	automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void