(OSX) Some forward-compatibility build fixes

This commit is contained in:
Twinaphex 2015-03-30 17:16:28 +02:00
parent ddb5aab3ed
commit 6774187790
2 changed files with 8 additions and 4 deletions

View File

@ -22,6 +22,8 @@
#include "../../menu/menu.h"
#include "../../retroarch.h"
#include <objc/runtime.h>
static void* const associated_core_key = (void*)&associated_core_key;
id<RetroArch_Platform> apple_platform;

View File

@ -23,6 +23,8 @@
#include "../../input/input_common.h"
#include "../../input/input_keymaps.h"
#include <objc/runtime.h>
static void* const associated_name_tag = (void*)&associated_name_tag;
@interface RAInputBinder : NSWindow
@ -209,12 +211,12 @@ NSWindowDelegate>
}
#pragma mark Section Table
- (int32_t)numberOfRowsInTableView:(NSTableView*)view
- (NSInteger)numberOfRowsInTableView:(NSTableView*)view
{
return self.settings.count;
}
- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int32_t)row
- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
{
#if defined(MAC_OS_X_VERSION_10_6)
return objc_getAssociatedObject([self.settings objectAtIndex:row], associated_name_tag);
@ -231,12 +233,12 @@ NSWindowDelegate>
}
#pragma mark Setting Outline
- (int32_t)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
{
return (item == nil) ? [self.currentGroup count] : [item count];
}
- (id)outlineView:(NSOutlineView *)outlineView child:(int32_t)idx ofItem:(id)item
- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)idx ofItem:(id)item
{
return (item == nil) ? [self.currentGroup objectAtIndex:idx] : [item objectAtIndex:idx];
}