partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase

[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 ecb95bf8156feabb68af0c968845a2698873ef3b..f684cce5c3e76e1e0d201cd237ac052c596ad2de 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
+++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
@@ -34,6 +34,7 @@ class BindingProxy : public sigc::trackable
 {
    public:
        BindingProxy (boost::shared_ptr<PBD::Controllable>);
+       BindingProxy ();
        virtual ~BindingProxy();
        
        void set_bind_button_state (guint button, guint statemask);
@@ -42,6 +43,7 @@ class BindingProxy : public sigc::trackable
        bool button_press_handler (GdkEventButton *);
 
        boost::shared_ptr<PBD::Controllable> get_controllable() { return controllable; }
+       void set_controllable (boost::shared_ptr<PBD::Controllable>);
 
   protected:
        Gtkmm2ext::PopUp*  prompter;