X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ApplicationController.h;h=5dae0cc04a525b0d295aba4ec8bc3d36c90b8f23;hp=6bb37b923abd493b71a6655fa211e3a4c865a3f9;hb=f864d363128de19fc6591b77ae9226b34166d715;hpb=c6fb77859e508aaef686b7a5a6a12abe29178708 diff --git a/ApplicationController.h b/ApplicationController.h index 6bb37b9..5dae0cc 100644 --- a/ApplicationController.h +++ b/ApplicationController.h @@ -6,11 +6,11 @@ // Copyright 2009 University of Otago. All rights reserved. // -@class JoystickController; +@class NJInputController; @class TargetController; @class ConfigsController; -@interface ApplicationController : NSObject { +@interface ApplicationController : NSObject { IBOutlet NSDrawer *drawer; IBOutlet NSWindow *mainWindow; IBOutlet NSToolbarItem *activeButton; @@ -18,13 +18,11 @@ 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 NJInputController *jsController; +@property (nonatomic, strong) IBOutlet TargetController *targetController; +@property (nonatomic, strong) IBOutlet ConfigsController *configsController; - (IBAction)toggleActivity:(id)sender; - (void)configsChanged; -- (void)configChanged; @end