From ab446c04386dad84a46ab15cbe6243b9015083db Mon Sep 17 00:00:00 2001 From: Eric Branlund Date: Wed, 26 Aug 2020 09:58:44 -0700 Subject: [PATCH] Revert "Removed terminalsMenu from the application delegate (not referenced by the code or by the Interface Builder file). Removed the IBAction designation from setGraphicsMode and selectWindow (both are not hooked to controls via InterfaceBuilder file). Removed the IBOutlet designation from AngbandView's angbandContext since it is not hooked to a user interface element by the Interface Builder file." This reverts commit 8c47d10ead16e2f2497f234fa380064ff21fb037. --- src/cocoa/AppDelegate.h | 5 +++-- src/main-cocoa.m | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cocoa/AppDelegate.h b/src/cocoa/AppDelegate.h index e0217c4ca..f8450b082 100644 --- a/src/cocoa/AppDelegate.h +++ b/src/cocoa/AppDelegate.h @@ -17,6 +17,7 @@ #import @interface AngbandAppDelegate : NSObject { + IBOutlet NSMenu *terminalsMenu; NSMenu *_graphicsMenu; NSMenu *_commandMenu; NSDictionary *_commandMenuTagMap; @@ -30,7 +31,7 @@ - (IBAction)saveGame:(id)sender; - (IBAction)setRefreshRate:(NSMenuItem *)sender; - (IBAction)toggleSound:(NSMenuItem *)menuItem; -- (void)setGraphicsMode:(NSMenuItem *)sender; -- (void)selectWindow:(id)sender; +- (IBAction)setGraphicsMode:(NSMenuItem *)sender; +- (IBAction)selectWindow:(id)sender; @end diff --git a/src/main-cocoa.m b/src/main-cocoa.m index 2d4084750..3d3cdd287 100644 --- a/src/main-cocoa.m +++ b/src/main-cocoa.m @@ -676,7 +676,7 @@ static bool initialized = FALSE; /* The NSView subclass that draws our Angband image */ @interface AngbandView : NSView { - AngbandContext *angbandContext; + IBOutlet AngbandContext *angbandContext; } - (void)setAngbandContext:(AngbandContext *)context; @@ -4128,7 +4128,7 @@ static void hook_quit(const char * str) [[NSUserDefaults angbandDefaults] setInteger:frames_per_second forKey:AngbandFrameRateDefaultsKey]; } -- (void)selectWindow: (id)sender +- (IBAction)selectWindow: (id)sender { NSInteger subwindowNumber = [(NSMenuItem *)sender tag] - AngbandWindowMenuItemTagBase; AngbandContext *context = angband_term[subwindowNumber]->data; @@ -4175,7 +4175,7 @@ static void hook_quit(const char * str) } } -- (void)setGraphicsMode:(NSMenuItem *)sender +- (IBAction)setGraphicsMode:(NSMenuItem *)sender { /* We stashed the graphics mode ID in the menu item's tag */ graf_mode_req = [sender tag]; -- 2.11.0