From f12ed861b095d0734173948594202e25ee7e926d Mon Sep 17 00:00:00 2001
From: Tomáš Znamenáček
Date: Fri, 28 Oct 2016 14:40:32 +0200
Subject: Use modern key mask constants instead of the ones deprecated in 10.12

See #99 for details.
---
 Framework/MASKeyCodes.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Framework/MASKeyCodes.h')

diff --git a/Framework/MASKeyCodes.h b/Framework/MASKeyCodes.h
index 989c942..b6b53fe 100644
--- a/Framework/MASKeyCodes.h
+++ b/Framework/MASKeyCodes.h
@@ -1,5 +1,6 @@
 #import <Carbon/Carbon.h>
 #import <AppKit/AppKit.h>
+#import "MASKeyCodes.h"
 
 // These glyphs are missed in Carbon.h
 enum {
@@ -30,14 +31,14 @@ NS_INLINE NSString* NSStringFromMASKeyCode(unsigned short ch)
 
 NS_INLINE NSUInteger MASPickCocoaModifiers(NSUInteger flags)
 {
-    return (flags & (NSControlKeyMask | NSShiftKeyMask | NSAlternateKeyMask | NSCommandKeyMask));
+    return (flags & (NSEventModifierFlagControl | NSEventModifierFlagShift | NSEventModifierFlagOption | NSEventModifierFlagCommand));
 }
 
 NS_INLINE UInt32 MASCarbonModifiersFromCocoaModifiers(NSUInteger cocoaFlags)
 {
     return
-          (cocoaFlags & NSCommandKeyMask ? cmdKey : 0)
-        | (cocoaFlags & NSAlternateKeyMask ? optionKey : 0)
-        | (cocoaFlags & NSControlKeyMask ? controlKey : 0)
-        | (cocoaFlags & NSShiftKeyMask ? shiftKey : 0);
+          (cocoaFlags & NSEventModifierFlagCommand ? cmdKey : 0)
+        | (cocoaFlags & NSEventModifierFlagOption ? optionKey : 0)
+        | (cocoaFlags & NSEventModifierFlagControl ? controlKey : 0)
+        | (cocoaFlags & NSEventModifierFlagShift ? shiftKey : 0);
 }
-- 
cgit v1.2.3