diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_dropdown.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_dropdown.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/gtk2_ardour/ardour_dropdown.cc b/gtk2_ardour/ardour_dropdown.cc index 741db8c2ce..6c527f2d27 100644 --- a/gtk2_ardour/ardour_dropdown.cc +++ b/gtk2_ardour/ardour_dropdown.cc @@ -67,17 +67,11 @@ ArdourDropdown::menu_size_request(Requisition *req) { req->width = max(req->width, get_allocation().get_width()); } -void -ArdourDropdown::position_menu(int& x, int& y, bool& push_in) { - Gtkmm2ext::position_menu_anchored (&_menu, this, get_text(), x, y, push_in); -} - bool ArdourDropdown::on_button_press_event (GdkEventButton* ev) { if (ev->type == GDK_BUTTON_PRESS) { - _menu.popup (sigc::mem_fun(this, &ArdourDropdown::position_menu), - 1, ev->time); + Gtkmm2ext::anchored_menu_popup(&_menu, this, get_text(), 1, ev->time); } return true; } diff --git a/gtk2_ardour/ardour_dropdown.h b/gtk2_ardour/ardour_dropdown.h index 5a710ec539..c50304046d 100644 --- a/gtk2_ardour/ardour_dropdown.h +++ b/gtk2_ardour/ardour_dropdown.h @@ -38,7 +38,6 @@ class ArdourDropdown : public ArdourButton bool on_button_press_event (GdkEventButton*); bool on_scroll_event (GdkEventScroll*); - void position_menu(int&, int&, bool&); void menu_size_request(Gtk::Requisition*); void clear_items (); diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 7832dcfbfe..d1accfdd12 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -955,9 +955,7 @@ GenericPluginUI::astate_clicked (ControlUI* cui) items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Touch, cui))); - automation_menu->popup ( - boost::bind (&Gtkmm2ext::position_menu_anchored, automation_menu, &cui->automate_button, "", _1, _2, _3), - 1, gtk_get_current_event_time()); + anchored_menu_popup(automation_menu, &cui->automate_button, "", 1, gtk_get_current_event_time()); } void |