From a616664af24006e697ec856489353da05ebeee57 Mon Sep 17 00:00:00 2001 From: Benau Date: Sat, 19 Oct 2019 13:00:28 +0800 Subject: [PATCH] Add menu command-q shortcut to quit STK in OSX --- lib/irrlicht/source/Irrlicht/MacOSX/AppDelegate.h | 2 +- lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/irrlicht/source/Irrlicht/MacOSX/AppDelegate.h b/lib/irrlicht/source/Irrlicht/MacOSX/AppDelegate.h index ccb116d33..002d62478 100644 --- a/lib/irrlicht/source/Irrlicht/MacOSX/AppDelegate.h +++ b/lib/irrlicht/source/Irrlicht/MacOSX/AppDelegate.h @@ -10,7 +10,7 @@ #import #import "CIrrDeviceMacOSX.h" -@interface AppDelegate : NSObject +@interface AppDelegate : NSObject { BOOL _quit; irr::CIrrDeviceMacOSX *_device; diff --git a/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm index fa56827d8..86d995275 100644 --- a/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +++ b/lib/irrlicht/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm @@ -497,7 +497,12 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param) [[NSAutoreleasePool alloc] init]; [NSApplication sharedApplication]; [NSApp setDelegate:[[[AppDelegate alloc] initWithDevice:this] autorelease]]; - [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; + NSMenu* mainMenu = [[[NSMenu alloc] initWithTitle:@""] autorelease]; + [NSApp setMainMenu:mainMenu]; + NSMenuItem* menuItem = [mainMenu addItemWithTitle:@"" action:nil keyEquivalent:@""]; + NSMenu* menu = [[NSMenu alloc] initWithTitle:@""]; + [menu addItemWithTitle:@"Quit SuperTuxKart" action:@selector(terminate:) keyEquivalent:@"q"]; + [menuItem setSubmenu:[menu autorelease]]; [NSApp finishLaunching]; }