X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_display.cc;h=17f3dc5dde171b101aedc71ae37108ac4a423dd0;hb=a5ae129a066747901ff1ed95368729b63cb6a70d;hp=ef845258ac5875cbbb29d7a07f82146121c070ae;hpb=b2b736d596123de52dac700db769ac4eb576da5c;p=ardour.git

diff --git a/gtk2_ardour/ardour_display.cc b/gtk2_ardour/ardour_display.cc
index ef845258ac..17f3dc5dde 100644
--- a/gtk2_ardour/ardour_display.cc
+++ b/gtk2_ardour/ardour_display.cc
@@ -24,6 +24,7 @@
 #include <pangomm/layout.h>
 
 #include "pbd/compose.h"
+#include "pbd/controllable.h"
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
@@ -35,8 +36,6 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_display.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
 
 #include "i18n.h"
 
@@ -52,8 +51,6 @@ using namespace std;
 
 ArdourDisplay::ArdourDisplay (Element e)
 {
-	signal_button_press_event().connect (sigc::mem_fun(*this, &ArdourDisplay::on_mouse_pressed));
-
 	add_elements(e);
 	add_elements(ArdourButton::Menu);
 	add_elements(ArdourButton::Text);
@@ -64,9 +61,9 @@ ArdourDisplay::~ArdourDisplay ()
 }
 
 bool
-ArdourDisplay::on_mouse_pressed (GdkEventButton*)
+ArdourDisplay::on_button_press_event (GdkEventButton*)
 {
-	_menu.popup (1, gtk_get_current_event_time());	
+	_menu.popup (1, gtk_get_current_event_time());
 	return true;
 }
 
@@ -87,12 +84,12 @@ ArdourDisplay::on_scroll_event (GdkEventScroll* ev)
 	boost::shared_ptr<PBD::Controllable> c = binding_proxy.get_controllable();
 	if (c) {
 		float val = c->get_interface();
-	
+
 		if ( ev->direction == GDK_SCROLL_UP )
 			val += 0.05 * scale;  //by default, we step in 1/20ths of the knob travel
 		else
 			val -= 0.05 * scale;
-			
+
 		c->set_interface(val);
 	}