enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / ardour_display.cc

diff --git a/gtk2_ardour/ardour_display.cc b/gtk2_ardour/ardour_display.cc
index ef845258ac5875cbbb29d7a07f82146121c070ae..a682833706fe4cd562160845275f5db54291a6f4 100644 (file)
--- 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,10 +36,8 @@
 #include "ardour/rc_configuration.h" // for widget prelight preference
 
 #include "ardour_display.h"
-#include "ardour_ui.h"
-#include "global_signals.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtkmm2ext;
 using namespace Gdk;
@@ -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);
        }