OSDN Git Service

Revert "Removed terminalsMenu from the application delegate (not referenced by the...
authorEric Branlund <ebranlund@fastmail.com>
Wed, 26 Aug 2020 16:58:44 +0000 (09:58 -0700)
committerEric Branlund <ebranlund@fastmail.com>
Wed, 26 Aug 2020 16:58:44 +0000 (09:58 -0700)
This reverts commit 8c47d10ead16e2f2497f234fa380064ff21fb037.

src/cocoa/AppDelegate.h
src/main-cocoa.m

index e0217c4..f8450b0 100644 (file)
@@ -17,6 +17,7 @@
 #import <Cocoa/Cocoa.h>
 
 @interface AngbandAppDelegate : NSObject <NSApplicationDelegate> {
+    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
index 2d40847..3d3cdd2 100644 (file)
@@ -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];