diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/gtkmm2ext/gtkmm2ext/binding_proxy.h | |
parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext/binding_proxy.h')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/binding_proxy.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h index dd9b94319d..ecb95bf815 100644 --- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h @@ -24,6 +24,7 @@ #include <string> #include <gtkmm2ext/popup.h> +#include <boost/shared_ptr.hpp> namespace PBD { class Controllable; @@ -32,7 +33,7 @@ namespace PBD { class BindingProxy : public sigc::trackable { public: - BindingProxy (PBD::Controllable&); + BindingProxy (boost::shared_ptr<PBD::Controllable>); virtual ~BindingProxy(); void set_bind_button_state (guint button, guint statemask); @@ -40,11 +41,11 @@ class BindingProxy : public sigc::trackable bool button_press_handler (GdkEventButton *); - PBD::Controllable* get_controllable() { return &controllable; } - protected: + boost::shared_ptr<PBD::Controllable> get_controllable() { return controllable; } + protected: Gtkmm2ext::PopUp* prompter; - PBD::Controllable& controllable; + boost::shared_ptr<PBD::Controllable> controllable; guint bind_button; guint bind_statemask; sigc::connection learning_connection; |