projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a bunch of stuff to make tab/window switching work better, and provide Alt-m to toggl...
[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 d6e31404623ee3275df0d7d0e8c6058349d31657..7108c46eb2b8af8c66c760b698c09f272511ae65 100644
(file)
--- a/
libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
+++ b/
libs/gtkmm2ext/gtkmm2ext/binding_proxy.h
@@
-39,10
+39,10
@@
class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable
BindingProxy (boost::shared_ptr<PBD::Controllable>);
BindingProxy ();
virtual ~BindingProxy();
BindingProxy (boost::shared_ptr<PBD::Controllable>);
BindingProxy ();
virtual ~BindingProxy();
-
+
void set_bind_button_state (guint button, guint statemask);
void set_bind_button_state (guint button, guint statemask);
- void get_bind_button_state (guint &button, guint &statemask);
+ static bool is_bind_action (GdkEventButton *);
bool button_press_handler (GdkEventButton *);
boost::shared_ptr<PBD::Controllable> get_controllable() const { return controllable; }
bool button_press_handler (GdkEventButton *);
boost::shared_ptr<PBD::Controllable> get_controllable() const { return controllable; }
@@
-51,8
+51,10
@@
class LIBGTKMM2EXT_API BindingProxy : public sigc::trackable
protected:
Gtkmm2ext::PopUp* prompter;
boost::shared_ptr<PBD::Controllable> controllable;
protected:
Gtkmm2ext::PopUp* prompter;
boost::shared_ptr<PBD::Controllable> controllable;
- guint bind_button;
- guint bind_statemask;
+
+ static guint bind_button;
+ static guint bind_statemask;
+
PBD::ScopedConnection learning_connection;
void learning_finished ();
bool prompter_hiding (GdkEventAny *);
PBD::ScopedConnection learning_connection;
void learning_finished ();
bool prompter_hiding (GdkEventAny *);