From 735f77cbfd5eab33864ac348e9e8f77a7e985204 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Sat, 11 Dec 2021 13:42:32 -0500
Subject: [PATCH] macos: Replace NSCommandKeyMask with
NSEventModifierFlagCommand, too.
Reference issue #106.
---
src/SDLmain/macosx/SDLMain.m | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/SDLmain/macosx/SDLMain.m b/src/SDLmain/macosx/SDLMain.m
index 673f89d..677ccb0 100644
--- a/src/SDLmain/macosx/SDLMain.m
+++ b/src/SDLmain/macosx/SDLMain.m
@@ -19,6 +19,8 @@ - (void)setAppleMenu:(NSMenu *)menu;
/* NSEventModifierFlagOption replaced NSAlternateKeyMask in 10.12, but it's the same value. */
#define EventModifierFlagOption (1 << 19)
+/* Same deal with the NSCommandKeyMask... */
+#define EventModifierFlagCommand (1 << 20)
/* Use this flag to determine whether we use SDLMain.nib or not */
#define SDL_USE_NIB_FILE 0
@@ -142,7 +144,7 @@ static void setApplicationMenu(void)
[appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
- [menuItem setKeyEquivalentModifierMask:(EventModifierFlagOption|NSCommandKeyMask)];
+ [menuItem setKeyEquivalentModifierMask:(EventModifierFlagOption|EventModifierFlagCommand)];
[appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];