diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-27 13:28:11 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | aa71d60ab990275bddd4a9ae0e378ed36e0c0fd4 (patch) | |
| tree | 51d3ea3951abe6c086f906e823d91efd1c9802dc /libs/gtkmm2ext/bindings.cc | |
| parent | fbc985f913a5b976719d371755c89c7b33dc2667 (diff) | |
remove Bindings::ignored_state and use Keyboard::RelevantModifierMask
Diffstat (limited to 'libs/gtkmm2ext/bindings.cc')
| -rw-r--r-- | libs/gtkmm2ext/bindings.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 46dda35aeb..583d3515d2 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -43,13 +43,12 @@ using namespace Gtkmm2ext; using namespace PBD; list<Bindings*> Bindings::bindings; /* global. Gulp */ -uint32_t Bindings::_ignored_state = 0; list<ActionMap*> ActionMap::action_maps; /* global. Gulp */ PBD::Signal1<void,Bindings*> Bindings::BindingsChanged; MouseButton::MouseButton (uint32_t state, uint32_t keycode) { - uint32_t ignore = Bindings::ignored_state(); + uint32_t ignore = ~Keyboard::RelevantModifierKeyMask; if (gdk_keyval_is_upper (keycode) && gdk_keyval_is_lower (keycode)) { /* key is not subject to case, so ignore SHIFT @@ -138,7 +137,7 @@ MouseButton::name () const KeyboardKey::KeyboardKey (uint32_t state, uint32_t keycode) { - uint32_t ignore = Bindings::ignored_state(); + uint32_t ignore = ~Keyboard::RelevantModifierKeyMask; _val = (state & ~ignore); _val <<= 32; |