Changed to have main-cocoa.m use the application delegate declaration from cocoa...

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f8b522..bdfe4a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,6 @@ EXTRA_hengband_SOURCES = \
        readdib.c readdib.h wall.bmp
 
 cocoa_xcode_files = \
-       cocoa/AppDelegate.h \
        cocoa/AppDelegate.m \
        cocoa/Base.lproj/MainMenu.xib
 cocoa_icon_files = \
@@ -132,7 +131,7 @@ EXTRA_DIST = \
        $(cocoa_ja_strings_files)
 
 if COCOA
-hengband_SOURCES += main-cocoa.m grafmode.h grafmode.c
+hengband_SOURCES += main-cocoa.m grafmode.h grafmode.c cocoa/AppDelegate.h
 AM_CFLAGS = -mmacosx-version-min=10.8 -Wunguarded-availability
 AM_OBJCFLAGS = -mmacosx-version-min=10.8 -Wunguarded-availability
 hengband_LDFLAGS = -framework cocoa $(AM_LDFLAGS)
@@ -168,7 +167,8 @@ appendir = $(APPRES)/en.lproj
 appja_DATA = $(cocoa_ja_strings_files)
 appjadir = $(APPRES)/ja.lproj
 else
-EXTRA_hengband_SOURCES += main-cocoa.m grafmode.h grafmode.c
+EXTRA_hengband_SOURCES += main-cocoa.m grafmode.h grafmode.c \
+       cocoa/AppDelegate.h
 hengband_LINK = $(LINK)
 endif
 

diff --git a/src/main-cocoa.m b/src/main-cocoa.m
index ea070f6..97f1df9 100644 (file)
--- a/src/main-cocoa.m
+++ b/src/main-cocoa.m
@@ -23,7 +23,7 @@
 #if defined(MACH_O_COCOA)
 
 /* Mac headers */
-#include <Cocoa/Cocoa.h>
+#include <cocoa/AppDelegate.h>
 //#include <Carbon/Carbon.h> /* For keycodes */
 /* Hack - keycodes to enable compiling in macOS 10.14 */
 #define kVK_Return 0x24
@@ -3897,29 +3897,6 @@ static void hook_quit(const char * str)
  * Main program
  * ------------------------------------------------------------------------ */
 
-@interface AngbandAppDelegate : NSObject {
-    IBOutlet NSMenu *terminalsMenu;
-    NSMenu *_graphicsMenu;
-    NSMenu *_commandMenu;
-    NSDictionary *_commandMenuTagMap;
-}
-
-@property (nonatomic, retain) IBOutlet NSMenu *graphicsMenu;
-@property (nonatomic, retain) IBOutlet NSMenu *commandMenu;
-@property (nonatomic, retain) NSDictionary *commandMenuTagMap;
-
-- (IBAction)newGame:sender;
-- (IBAction)openGame:sender;
-
-- (IBAction)editFont:sender;
-- (IBAction)setGraphicsMode:(NSMenuItem *)sender;
-- (IBAction)toggleSound:(NSMenuItem *)sender;
-
-- (IBAction)setRefreshRate:(NSMenuItem *)menuItem;
-- (IBAction)selectWindow: (id)sender;
-
-@end
-
 @implementation AngbandAppDelegate
 
 @synthesize graphicsMenu=_graphicsMenu;