Formal protocol for the interface shared between Joysticks and JSActions, use new...

[enjoyable.git] / ApplicationController.h

diff --git a/ApplicationController.h b/ApplicationController.h
index 581abc2..a5dcb6a 100644 (file)
--- a/ApplicationController.h
+++ b/ApplicationController.h
@@ -6,13 +6,11 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-
 @class JoystickController;
 @class TargetController;
 @class ConfigsController;
 
-@interface ApplicationController : NSObject {
+@interface ApplicationController : NSObject <NSApplicationDelegate> {
     IBOutlet NSDrawer *drawer;
     IBOutlet NSWindow *mainWindow;
     IBOutlet NSToolbarItem *activeButton;
@@ -20,10 +18,9 @@
     IBOutlet NSMenu *dockMenuBase;
 }
 
-@property (strong) IBOutlet JoystickController *jsController;
-@property (strong) IBOutlet TargetController *targetController;
-@property (strong) IBOutlet ConfigsController *configsController;
-@property (assign) BOOL active;
+@property (nonatomic, strong) IBOutlet JoystickController *jsController;
+@property (nonatomic, strong) IBOutlet TargetController *targetController;
+@property (nonatomic, strong) IBOutlet ConfigsController *configsController;
 
 - (IBAction)toggleActivity:(id)sender;
 - (void)configsChanged;