summaryrefslogtreecommitdiff
path: root/macosx/ConfigurationController.h
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-12-15 21:07:55 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-12-15 21:07:55 +0000
commitbe3d963074ee8adf5da0371761e090488b3681d3 (patch)
tree24ac0f45405136899584fe3ef2c022c148bfb352 /macosx/ConfigurationController.h
parentc0cba1977a8cac317af37c3004c53417fbce31bc (diff)
downloadpcsxr-be3d963074ee8adf5da0371761e090488b3681d3.tar.gz
Mac Patch 13437.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81770 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/ConfigurationController.h')
-rw-r--r--macosx/ConfigurationController.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/macosx/ConfigurationController.h b/macosx/ConfigurationController.h
index bcfdc314..2e88f445 100644
--- a/macosx/ConfigurationController.h
+++ b/macosx/ConfigurationController.h
@@ -2,6 +2,7 @@
#import <Cocoa/Cocoa.h>
#import "PluginController.h"
+#import "HotkeyController.h"
#import "PluginList.h"
extern NSString *memChangeNotifier;
@@ -31,6 +32,10 @@ extern NSString *memChangeNotifier;
IBOutlet id noFastBootCell;
IBOutlet id enableNetPlayCell;
IBOutlet id widescreen;
+
+ // Hotkeys
+ IBOutlet HotkeyController *hkController;
+ IBOutlet NSTabViewItem *hkTab;
IBOutlet NSTextField *mcd1Label;
IBOutlet NSTextField *mcd2Label;
@@ -50,4 +55,6 @@ extern NSString *memChangeNotifier;
- (NSString *)keyForSender:(id)sender;
+ (void)setMemoryCard:(int)theCard toPath:(NSString *)theFile;
+- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem;
+
@end