From f97696d7f338a203665f4cbe6a4065810bdaaeee Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Sun, 7 Aug 2016 19:44:54 +0200 Subject: Make ArdourDisplay a subclass of ArdourDropdown --- gtk2_ardour/ardour_display.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/ardour_display.h') diff --git a/gtk2_ardour/ardour_display.h b/gtk2_ardour/ardour_display.h index 8b7712ddcc..1b7c65480e 100644 --- a/gtk2_ardour/ardour_display.h +++ b/gtk2_ardour/ardour_display.h @@ -27,9 +27,9 @@ #include -#include "ardour_button.h" +#include "ardour_dropdown.h" -class ArdourDisplay : public ArdourButton +class ArdourDisplay : public ArdourDropdown { public: @@ -39,8 +39,6 @@ class ArdourDisplay : public ArdourButton boost::shared_ptr get_controllable() { return binding_proxy.get_controllable(); } void set_controllable (boost::shared_ptr c); - bool on_button_press_event (GdkEventButton*); //mousedown will pop up our preset menu -// bool on_button_press_event (GdkEventButton*); // bool on_button_release_event (GdkEventButton*); bool on_scroll_event (GdkEventScroll* ev); // bool on_motion_notify_event (GdkEventMotion *ev) ; @@ -50,9 +48,6 @@ class ArdourDisplay : public ArdourButton void controllable_changed (); PBD::ScopedConnection watch_connection; - - private: - Gtk::Menu _menu; }; #endif /* __gtk2_ardour_ardour_menu_h__ */ -- cgit v1.2.3