From 39a2d270fc74a986816dbd15905604e3d4501b1a Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 20 Jun 2020 14:39:42 +0100
Subject: [PATCH] Fix some macOS 10.12 SDK deprecation warnings

---
 src/GUI/FGCocoaMenuBar.mm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/GUI/FGCocoaMenuBar.mm b/src/GUI/FGCocoaMenuBar.mm
index 9980c6c08..befc0e9de 100644
--- a/src/GUI/FGCocoaMenuBar.mm
+++ b/src/GUI/FGCocoaMenuBar.mm
@@ -116,7 +116,7 @@ static void setFunctionKeyShortcut(const std::string& shortcut, NSMenuItem* item
     
   unichar ch[1];
   ch[0] = shortcutChar;
-  [item setKeyEquivalentModifierMask:NSFunctionKeyMask];
+  [item setKeyEquivalentModifierMask:NSEventModifierFlagFunction];
   [item setKeyEquivalent:[NSString stringWithCharacters:ch length:1]];
   
 }
@@ -148,9 +148,9 @@ static void setItemShortcutFromString(NSMenuItem* item, const string& s)
     simgear::strutils::lowercase(shortcut);
   [item setKeyEquivalent:[NSString stringWithCString:shortcut.c_str() encoding:NSUTF8StringEncoding]];
   NSUInteger modifiers = 0;
-  if (hasCtrl) modifiers |= NSControlKeyMask;
-  if (hasShift) modifiers |= NSShiftKeyMask;
-  if (hasAlt) modifiers |= NSAlternateKeyMask;
+  if (hasCtrl) modifiers |= NSEventModifierFlagControl;
+  if (hasShift) modifiers |= NSEventModifierFlagShift;
+  if (hasAlt) modifiers |= NSEventModifierFlagOption;
   
   [item setKeyEquivalentModifierMask:modifiers];
 }