diff options
| author | Tomáš Znamenáček | 2016-10-28 14:52:37 +0200 |
|---|---|---|
| committer | Tomáš Znamenáček | 2016-10-28 14:52:37 +0200 |
| commit | 0d54ede8699d90997022d2286ef65953b7761628 (patch) | |
| tree | b4cf9cab11c42ecc29d86d498b7f045a7a4cdc00 /Framework | |
| parent | f12ed861b095d0734173948594202e25ee7e926d (diff) | |
| download | MASShortcut-0d54ede8699d90997022d2286ef65953b7761628.tar.bz2 | |
Trying to fix conditional key mask definition on 10.12
Diffstat (limited to 'Framework')
| -rw-r--r-- | Framework/MASKeyMasks.h | 6 | ||||
| -rw-r--r-- | Framework/Shortcut.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Framework/MASKeyMasks.h b/Framework/MASKeyMasks.h index 1c3a0b9..e541c32 100644 --- a/Framework/MASKeyMasks.h +++ b/Framework/MASKeyMasks.h @@ -1,3 +1,5 @@ +#import <Availability.h> + // https://github.com/shpakovski/MASShortcut/issues/99 // // Long story short: NSControlKeyMask and friends were replaced with NSEventModifierFlagControl @@ -7,8 +9,8 @@ // since it breaks the build on older SDKs – in Travis, for example. // // It should be safe to remove this whole thing once the 10.12 SDK is ubiquitous. -// -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 + +#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1012 #define NSEventModifierFlagCommand NSCommandKeyMask #define NSEventModifierFlagControl NSControlKeyMask #define NSEventModifierFlagOption NSAlternateKeyMask diff --git a/Framework/Shortcut.h b/Framework/Shortcut.h index e131395..5a8de8e 100644 --- a/Framework/Shortcut.h +++ b/Framework/Shortcut.h @@ -1,7 +1,8 @@ +#import "MASKeyMasks.h" #import "MASShortcut.h" #import "MASShortcutValidator.h" #import "MASShortcutMonitor.h" #import "MASShortcutBinder.h" #import "MASDictionaryTransformer.h" #import "MASShortcutView.h" -#import "MASShortcutView+Bindings.h"
\ No newline at end of file +#import "MASShortcutView+Bindings.h" |