CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-24 11:45:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Apple) More 10.6 fixes:

Browse Source 
Manually declare ivars used as backing for synthesized properties.
	Fix a couple of wiring errors in the .xib files.
	Don’t call release on a drained auto release pool.
This commit is contained in:
meancoot 2013-12-13 21:14:42 -05:00
parent b946a5e302
commit 7f560672e7
5 changed files with 80 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
apple/OSX/en.lproj/MainMenu.xib
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1090</int>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">13A603</string>
<string key="IBDocument.InterfaceBuilderVersion">4514</string>
<string key="IBDocument.AppKitVersion">1265</string>
@ -355,15 +355,6 @@
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="257009827">
<reference key="NSMenu" ref="835318025"/>
<string key="NSTitle">Toggle Full Screen Mode</string>
<string key="NSKeyEquiv">f</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="299356726">
<reference key="NSMenu" ref="835318025"/>
<bool key="NSIsDisabled">YES</bool>
@ -426,9 +417,12 @@
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="439893737">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{480, 360}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@ -608,6 +602,7 @@
<string key="NSFrame">{{180, 13}, {82, 32}}</string>
<reference key="NSSuperview" ref="327272550"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="404714727">
@ -744,22 +739,6 @@
</object>
<int key="connectionID">493</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFullScreen:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="257009827"/>
</object>
<int key="connectionID">583</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="972006081"/>
</object>
<int key="connectionID">532</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">basicEvent:</string>
@ -792,14 +771,6 @@
</object>
<int key="connectionID">556</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_coreSelectSheet</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="361653618"/>
</object>
<int key="connectionID">569</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">coreWasChosen:</string>
@ -824,6 +795,22 @@
</object>
<int key="connectionID">588</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">coreSelectSheet</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="361653618"/>
</object>
<int key="connectionID">590</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="972006081"/>
</object>
<int key="connectionID">591</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@ -1024,7 +1011,6 @@
<reference ref="625202149"/>
<reference ref="575023229"/>
<reference ref="1011231497"/>
<reference ref="257009827"/>
</array>
<reference key="parent" ref="713487014"/>
</object>
@ -1183,11 +1169,6 @@
<reference key="object" ref="404714727"/>
<reference key="parent" ref="59737118"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">582</int>
<reference key="object" ref="257009827"/>
<reference key="parent" ref="835318025"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">585</int>
<reference key="object" ref="1225315"/>
@ -1261,7 +1242,6 @@
<string key="570.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="571.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="585.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="586.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="587.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -1276,7 +1256,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">588</int>
<int key="maxID">591</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -1317,6 +1297,10 @@
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="4600" key="NS.object.0"/>

73
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="899143711"/>
<reference key="NSNextKeyView" ref="176799935"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@ -366,7 +366,6 @@
<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>
@ -392,7 +391,7 @@
<string key="NSFrame">{{178, 20}, {561, 557}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="176799935"/>
<reference key="NSNextKeyView" ref="119087162"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="899143711"/>
@ -483,7 +482,6 @@
<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">
@ -557,30 +555,6 @@
</object>
<int key="connectionID">113</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_window</string>
<reference key="source" ref="897541637"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">100</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_table</string>
<reference key="source" ref="897541637"/>
<reference key="destination" ref="223530966"/>
</object>
<int key="connectionID">104</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_outline</string>
<reference key="source" ref="897541637"/>
<reference key="destination" ref="962679450"/>
</object>
<int key="connectionID">180</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">booleanCell</string>
@ -613,6 +587,22 @@
</object>
<int key="connectionID">603</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">outline</string>
<reference key="source" ref="897541637"/>
<reference key="destination" ref="962679450"/>
</object>
<int key="connectionID">604</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">table</string>
<reference key="source" ref="897541637"/>
<reference key="destination" ref="223530966"/>
</object>
<int key="connectionID">605</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dataSource</string>
@ -882,7 +872,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">603</int>
<int key="maxID">605</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -920,26 +910,13 @@
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="_inputWindow">NSWindow</string>
<string key="_outline">NSOutlineView</string>
<string key="_table">NSTableView</string>
<string key="binderCell">NSTextFieldCell</string>
<string key="binderWindow">RAInputBinder</string>
<string key="booleanCell">NSButtonCell</string>
<string key="outline">NSOutlineView</string>
<string key="table">NSTableView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="_inputWindow">
<string key="name">_inputWindow</string>
<string key="candidateClassName">NSWindow</string>
</object>
<object class="IBToOneOutletInfo" key="_outline">
<string key="name">_outline</string>
<string key="candidateClassName">NSOutlineView</string>
</object>
<object class="IBToOneOutletInfo" key="_table">
<string key="name">_table</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo" key="binderCell">
<string key="name">binderCell</string>
<string key="candidateClassName">NSTextFieldCell</string>
@ -952,6 +929,14 @@
<string key="name">booleanCell</string>
<string key="candidateClassName">NSButtonCell</string>
</object>
<object class="IBToOneOutletInfo" key="outline">
<string key="name">outline</string>
<string key="candidateClassName">NSOutlineView</string>
</object>
<object class="IBToOneOutletInfo" key="table">
<string key="name">table</string>
<string key="candidateClassName">NSTableView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>

9
apple/OSX/platform.m
View File

@ -81,6 +81,15 @@ static void* const associated_core_key = (void*)&associated_core_key;
@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;

15
apple/OSX/settings.m
View File

@ -29,6 +29,11 @@ static void* const associated_name_tag = (void*)&associated_name_tag;
@end
@implementation RAInputBinder
{
NSTimer* _timer;
const rarch_setting_t* _setting;
}
@synthesize timer = _timer;
@synthesize setting = _setting;
@ -95,6 +100,16 @@ 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;
@synthesize binderCell = _binderCell;

1
apple/common/RAGameView.m
View File

@ -331,7 +331,6 @@ static RAScreen* get_chosen_screen()
RAScreen *s = (RAScreen*)[screens objectAtIndex:g_settings.video.monitor_index];
#ifdef OSX
[pool drain];
[pool release];
#endif
return s;
#ifdef IOS