From 4d55a8b8254dff61fdc7b1959f6aef7eafbd9439 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 9 Nov 2011 20:49:54 +0000 Subject: Patch 10767 (Durandal_1707). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFInput/macsrc/ControllerList.h | 5 ++--- macosx/plugins/DFInput/macsrc/MappingCell.m | 4 ++-- macosx/plugins/DFInput/macsrc/cfg.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'macosx/plugins/DFInput/macsrc') 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 -#import +#import #include "cfg.h" @class KeyConfig; -@interface ControllerList : NSObject { +@interface ControllerList : NSObject { } - (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; } -- cgit v1.2.3