diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-21 23:19:04 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-08-21 23:19:04 +0000 |
| commit | de13f7dcbaa84255fa578aafe862f90c46225a01 (patch) | |
| tree | 0da83fa6b6e634d1f3e4a7af7e629d5473cfd76e /macosx/plugins/DFInput | |
| parent | e57165ae3f1706afec533d7b3cae17555a0f38ad (diff) | |
| download | pcsxr-de13f7dcbaa84255fa578aafe862f90c46225a01.tar.gz | |
Fix OS X 10.8-only behavior in the XGL plug-in.
Remove some commented-out code on Cocoa code.
Change some ints passed in Cocoa code to NSIntegers.
Replace a deprecated function call to NSRunAlertPanelRelativeToWindow.
Other minor fixes and improvements.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86808 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFInput')
| -rwxr-xr-x | macosx/plugins/DFInput/macsrc/ControllerList.h | 2 | ||||
| -rwxr-xr-x | macosx/plugins/DFInput/macsrc/ControllerList.m | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h index d0d1fb13..7eab9a54 100755 --- a/macosx/plugins/DFInput/macsrc/ControllerList.h +++ b/macosx/plugins/DFInput/macsrc/ControllerList.h @@ -33,7 +33,7 @@ + (void)setCurrentController:(int)which; + (int)currentController; -+ (int)buttonOfRow:(int)row; ++ (int)buttonOfRow:(NSInteger)row; - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex; - (void)deleteRow:(NSInteger)which; diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m index 4e208cab..a1d4deed 100755 --- a/macosx/plugins/DFInput/macsrc/ControllerList.m +++ b/macosx/plugins/DFInput/macsrc/ControllerList.m @@ -105,7 +105,7 @@ static const int DPad[DKEY_TOTAL] = { DKEY_ANALOG }; -+ (int)buttonOfRow:(int)row ++ (int)buttonOfRow:(NSInteger)row { return DPad[row]; } |