projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into cairocanvas
[ardour.git]
/
libs
/
gtkmm2ext
/
gtkmm2ext
/
keyboard.h
diff --git
a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 909f791403e2228538c222c93c420731fd92aa43..2c6b026a424f73a6d79a32bf851efef009adcc3c 100644
(file)
--- a/
libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/
libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@
-59,6
+59,11
@@
class Keyboard : public sigc::trackable, PBD::Stateful
static uint32_t GainFineScaleModifier;
static uint32_t GainExtraFineScaleModifier;
static uint32_t GainFineScaleModifier;
static uint32_t GainExtraFineScaleModifier;
+ // Modifiers for scroll wheel
+ static uint32_t ScrollZoomVerticalModifier;
+ static uint32_t ScrollZoomHorizontalModifier;
+ static uint32_t ScrollHorizontalModifier;
+
static const char* primary_modifier_name ();
static const char* secondary_modifier_name ();
static const char* tertiary_modifier_name ();
static const char* primary_modifier_name ();
static const char* secondary_modifier_name ();
static const char* tertiary_modifier_name ();
@@
-159,7
+164,7
@@
class Keyboard : public sigc::trackable, PBD::Stateful
}
};
}
};
- sigc::signal0<void>
Shift
Released;
+ sigc::signal0<void>
ZoomVerticalModifier
Released;
protected:
static Keyboard* _the_keyboard;
protected:
static Keyboard* _the_keyboard;