Merge branch 'master' into cairocanvas

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / binding_proxy.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
index 348f9f26499c59eb405f85bc0e65b7a4fbea17d4..b541582f6f669fb82a80ce7eb49ca245c7981463 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
+++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <gtkmm2ext/popup.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
+#include "pbd/signals.h"
 
 namespace PBD {
        class Controllable;
@@ -42,7 +42,7 @@ class BindingProxy : public sigc::trackable
 
        bool button_press_handler (GdkEventButton *);
 
-       boost::shared_ptr<PBD::Controllable> get_controllable() { return controllable; }
+       boost::shared_ptr<PBD::Controllable> get_controllable() const { return controllable; }
        void set_controllable (boost::shared_ptr<PBD::Controllable>);
 
   protected:
@@ -50,7 +50,7 @@ class BindingProxy : public sigc::trackable
        boost::shared_ptr<PBD::Controllable> controllable;
        guint bind_button;
        guint bind_statemask;
-       boost::signals2::scoped_connection learning_connection;
+       PBD::ScopedConnection learning_connection;
        void learning_finished ();
        bool prompter_hiding (GdkEventAny *);
 };