3 files changed, 6 insertions, 7 deletions
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h
index af0d0407..671c51ff 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.h
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.h
@@ -21,13 +21,12 @@
 
 #define ControllerList NetPcsxrHIDInputPluginControllerList
 
-#import <Foundation/Foundation.h>
-#import <AppKit/NSTableView.h>
+#import <Cocoa/Cocoa.h>
 #include "cfg.h"
 
 @class KeyConfig;
 
-@interface ControllerList : NSObject {
+@interface ControllerList : NSObject <NSTableViewDataSource> {
 }
 
 - (id)initWithConfig;
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m
index 2a382436..48e5dfe5 100644
--- a/macosx/plugins/DFInput/macsrc/MappingCell.m
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.m
@@ -31,7 +31,7 @@
 	return self;
 }
 
-- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(long)selStart length:(long)selLength
+- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength
 {
 	[super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength];
 
@@ -74,7 +74,7 @@
 			[tableView deselectAll:self];
 			return;
 		}
-		[tableView selectRow:nextRow byExtendingSelection:NO];
+		[tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:nextRow] byExtendingSelection:NO];
 
 		/* discard any events we have received while waiting for the button press */
 		endEvent = [NSEvent otherEventWithType:NSApplicationDefined location:where 
diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c
index f251996d..3e0ee1d5 100644
--- a/macosx/plugins/DFInput/macsrc/cfg.c
+++ b/macosx/plugins/DFInput/macsrc/cfg.c
@@ -672,7 +672,7 @@ int ReadDKeyEvent(int padnum, int key) {
 		}
 
 		// check mouse events
-		if (Button()) {
+		if (GetCurrentButtonState()) {
 			changed = 2;
 			goto end;
 		}
@@ -755,7 +755,7 @@ int ReadAnalogEvent(int padnum, int analognum, int analogdir) {
 		}
 
 		// check mouse events
-		if (Button()) {
+		if (GetCurrentButtonState()) {
 			changed = 2;
 			goto end;
 		}