mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 03:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(OSX) Move ivar definitions into the classes @interface rather than @implementation

Browse Source
This commit is contained in:
meancoot 2013-12-14 19:11:07 -05:00
parent f5edd42535
commit c8d6ce4587
4 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apple/OSX/en.lproj/Settings.xib
View File

@ -240,7 +240,7 @@
<string key="NSFrameSize">{559, 539}</string>
<reference key="NSSuperview" ref="119087162"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="176799935"/>
<reference key="NSNextKeyView" ref="899143711"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@ -366,6 +366,7 @@
<string key="NSFrame">{{1, 541}, {486, 15}}</string>
<reference key="NSSuperview" ref="46895506"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@ -391,7 +392,7 @@
<string key="NSFrame">{{178, 20}, {561, 557}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="119087162"/>
<reference key="NSNextKeyView" ref="176799935"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="899143711"/>
@ -482,6 +483,7 @@
<string key="NSFrame">{{384, 13}, {82, 32}}</string>
<reference key="NSSuperview" ref="729831377"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="637914132">

15
apple/OSX/platform.h
View File

@ -27,6 +27,21 @@
@end
@interface RetroArch_OSX : NSObject<RetroArch_Platform, NSApplicationDelegate>
{
NSWindow* _window;
NSString* _configDirectory;
NSString* _globalConfigFile;
NSString* _coreDirectory;
NSWindowController* _settingsWindow;
NSWindow* _coreSelectSheet;
NSString* _file;
NSString* _core;
bool _isTerminating;
bool _loaded;
bool _wantReload;
}
@property (nonatomic, retain) NSWindow IBOutlet* window;
@property (nonatomic, copy) NSString* configDirectory; // e.g. /var/mobile/Documents/.RetroArch
@property (nonatomic, copy) NSString* globalConfigFile; // e.g. /var/mobile/Documents/.RetroArch/retroarch.cfg

14
apple/OSX/platform.m
View File

@ -80,20 +80,6 @@ static void* const associated_core_key = (void*)&associated_core_key;
@end
@implementation RetroArch_OSX
{
NSWindow* _window;
NSString* _configDirectory;
NSString* _globalConfigFile;
NSString* _coreDirectory;
NSWindowController* _settingsWindow;
NSWindow* _coreSelectSheet;
NSString* _file;
NSString* _core;
bool _isTerminating;
bool _loaded;
bool _wantReload;
}
@synthesize window = _window;
@synthesize configDirectory = _configDirectory;

28
apple/OSX/settings.m
View File

@ -24,15 +24,16 @@
static void* const associated_name_tag = (void*)&associated_name_tag;
@interface RAInputBinder : NSWindow
{
NSTimer* _timer;
const rarch_setting_t* _setting;
}
@property (nonatomic, retain) NSTimer* timer;
@property (nonatomic, assign) const rarch_setting_t* setting;
@end
@implementation RAInputBinder
{
NSTimer* _timer;
const rarch_setting_t* _setting;
}
@synthesize timer = _timer;
@synthesize setting = _setting;
@ -90,6 +91,16 @@ static void* const associated_name_tag = (void*)&associated_name_tag;
@interface RASettingsDelegate : NSObject<NSTableViewDataSource, NSTableViewDelegate,
NSOutlineViewDataSource, NSOutlineViewDelegate,
NSWindowDelegate>
{
RAInputBinder* _binderWindow;
NSButtonCell* _booleanCell;
NSTextFieldCell* _binderCell;
NSTableView* _table;
NSOutlineView* _outline;
NSMutableArray* _settings;
NSMutableArray* _currentGroup;
}
@property (nonatomic, retain) RAInputBinder IBOutlet* binderWindow;
@property (nonatomic, retain) NSButtonCell IBOutlet* booleanCell;
@property (nonatomic, retain) NSTextFieldCell IBOutlet* binderCell;
@ -100,15 +111,6 @@ static void* const associated_name_tag = (void*)&associated_name_tag;
@end
@implementation RASettingsDelegate
{
RAInputBinder* _binderWindow;
NSButtonCell* _booleanCell;
NSTextFieldCell* _binderCell;
NSTableView* _table;
NSOutlineView* _outline;
NSMutableArray* _settings;
NSMutableArray* _currentGroup;
}
@synthesize binderWindow = _binderWindow;
@synthesize booleanCell = _booleanCell;