fly/flightgear
1
0
Fork 0
Code Activity

Fix some macOS 10.12 SDK deprecation warnings

Browse source
This commit is contained in:
James Turner 2020-06-20 14:39:42 +01:00
parent a9f48ce130
commit 39a2d270fc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/GUI/FGCocoaMenuBar.mm
View file

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