ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: Create new DisplayView objects in code instead of creating them implicitly through the nib.

This commit is contained in:
rogerman 2017-09-13 14:48:19 -07:00
parent c94f353f2a
commit d33faecd12
3 changed files with 3048 additions and 3060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
desmume/src/frontend/cocoa/translations/English.lproj/DisplayWindow.xib
View File

@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10K549</string> <string key="IBDocument.SystemVersion">13F1911</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1038.36</string> <string key="IBDocument.AppKitVersion">1265.21</string>
<string key="IBDocument.HIToolboxVersion">461.00</string> <string key="IBDocument.HIToolboxVersion">698.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">851</string> <string key="NS.object.0">851</string>
@ -355,7 +355,8 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
</object> </object>
</object> </object>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> <nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{256, 408}</string> <string key="NSWindowContentMinSize">{256, 408}</string>
<object class="NSView" key="NSWindowView" id="1027645320"> <object class="NSView" key="NSWindowView" id="1027645320">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
@ -385,7 +386,7 @@
<object class="NSFont" key="NSSupport" id="26"> <object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double> <double key="NSSize">11</double>
<int key="NSfFlags">3100</int> <int key="NSfFlags">3088</int>
</object> </object>
<string key="NSPlaceholderString">Status Text</string> <string key="NSPlaceholderString">Status Text</string>
<reference key="NSControlView" ref="731708450"/> <reference key="NSControlView" ref="731708450"/>
@ -408,14 +409,8 @@
</object> </object>
</object> </object>
</object> </object>
</object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<object class="NSCustomView" id="740908585"> <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
<reference key="NSNextResponder" ref="1027645320"/>
<int key="NSvFlags">45</int>
<string key="NSFrame">{{0, 24}, {256, 384}}</string>
<reference key="NSSuperview" ref="1027645320"/>
<reference key="NSWindow"/>
<string key="NSClassName">DisplayView</string>
</object> </object>
<object class="NSPopUpButton" id="347607109"> <object class="NSPopUpButton" id="347607109">
<reference key="NSNextResponder" ref="1027645320"/> <reference key="NSNextResponder" ref="1027645320"/>
@ -425,12 +420,12 @@
<reference key="NSWindow"/> <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1063916850"> <object class="NSPopUpButtonCell" key="NSCell" id="1063916850">
<int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">134219776</int> <int key="NSCellFlags2">134219776</int>
<object class="NSFont" key="NSSupport" id="844216569"> <object class="NSFont" key="NSSupport" id="844216569">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double> <double key="NSSize">13</double>
<int key="NSfFlags">1044</int> <int key="NSfFlags">1040</int>
</object> </object>
<reference key="NSControlView" ref="347607109"/> <reference key="NSControlView" ref="347607109"/>
<int key="NSButtonFlags">-2043002880</int> <int key="NSButtonFlags">-2043002880</int>
@ -485,6 +480,7 @@
<bool key="NSAltersState">YES</bool> <bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int> <int key="NSArrowPosition">2</int>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
<object class="NSPopUpButton" id="154157914"> <object class="NSPopUpButton" id="154157914">
<reference key="NSNextResponder" ref="1027645320"/> <reference key="NSNextResponder" ref="1027645320"/>
@ -494,7 +490,7 @@
<reference key="NSWindow"/> <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="480563989"> <object class="NSPopUpButtonCell" key="NSCell" id="480563989">
<int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">134219776</int> <int key="NSCellFlags2">134219776</int>
<reference key="NSSupport" ref="844216569"/> <reference key="NSSupport" ref="844216569"/>
<reference key="NSControlView" ref="154157914"/> <reference key="NSControlView" ref="154157914"/>
@ -546,6 +542,7 @@
<bool key="NSAltersState">YES</bool> <bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int> <int key="NSArrowPosition">2</int>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</object> </object>
<string key="NSFrameSize">{256, 408}</string> <string key="NSFrameSize">{256, 408}</string>
@ -553,8 +550,9 @@
<reference key="NSWindow"/> <reference key="NSWindow"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1920, 1177}}</string> <string key="NSScreenRect">{{0, 0}, {1920, 1177}}</string>
<string key="NSMinSize">{256, 476}</string> <string key="NSMinSize">{256, 477}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object> </object>
<object class="NSCustomView" id="365545800"> <object class="NSCustomView" id="365545800">
<nil key="NSNextResponder"/> <nil key="NSNextResponder"/>
@ -568,7 +566,7 @@
<reference key="NSSuperview" ref="365545800"/> <reference key="NSSuperview" ref="365545800"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="820027893"> <object class="NSPopUpButtonCell" key="NSCell" id="820027893">
<int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">2048</int> <int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="844216569"/> <reference key="NSSupport" ref="844216569"/>
<reference key="NSControlView" ref="753953961"/> <reference key="NSControlView" ref="753953961"/>
@ -658,6 +656,7 @@
<bool key="NSAltersState">YES</bool> <bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">2</int> <int key="NSArrowPosition">2</int>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
<object class="NSTextField" id="519006720"> <object class="NSTextField" id="519006720">
<reference key="NSNextResponder" ref="365545800"/> <reference key="NSNextResponder" ref="365545800"/>
@ -674,6 +673,8 @@
<reference key="NSBackgroundColor" ref="949245653"/> <reference key="NSBackgroundColor" ref="949245653"/>
<reference key="NSTextColor" ref="434655141"/> <reference key="NSTextColor" ref="434655141"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
</object> </object>
<string key="NSFrameSize">{350, 35}</string> <string key="NSFrameSize">{350, 35}</string>
@ -710,6 +711,7 @@
<int key="NSPeriodicDelay">200</int> <int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
<object class="NSTextField" id="261027162"> <object class="NSTextField" id="261027162">
<reference key="NSNextResponder" ref="545736283"/> <reference key="NSNextResponder" ref="545736283"/>
@ -724,7 +726,7 @@
<object class="NSFont" key="NSSupport" id="22"> <object class="NSFont" key="NSSupport" id="22">
<string key="NSName">LucidaGrande</string> <string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double> <double key="NSSize">9</double>
<int key="NSfFlags">3614</int> <int key="NSfFlags">3600</int>
</object> </object>
<object class="NSNumberFormatter" key="NSFormatter" id="405997883"> <object class="NSNumberFormatter" key="NSFormatter" id="405997883">
<object class="NSMutableDictionary" key="NS.attributes"> <object class="NSMutableDictionary" key="NS.attributes">
@ -808,6 +810,8 @@
<reference key="NSBackgroundColor" ref="949245653"/> <reference key="NSBackgroundColor" ref="949245653"/>
<reference key="NSTextColor" ref="434655141"/> <reference key="NSTextColor" ref="434655141"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSSlider" id="738109744"> <object class="NSSlider" id="738109744">
<reference key="NSNextResponder" ref="545736283"/> <reference key="NSNextResponder" ref="545736283"/>
@ -830,6 +834,7 @@
<bool key="NSAllowsTickMarkValuesOnly">NO</bool> <bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">YES</bool> <bool key="NSVertical">YES</bool>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</object> </object>
<string key="NSFrameSize">{55, 139}</string> <string key="NSFrameSize">{55, 139}</string>
@ -918,6 +923,8 @@
<reference key="NSBackgroundColor" ref="949245653"/> <reference key="NSBackgroundColor" ref="949245653"/>
<reference key="NSTextColor" ref="434655141"/> <reference key="NSTextColor" ref="434655141"/>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object> </object>
<object class="NSSlider" id="782084649"> <object class="NSSlider" id="782084649">
<reference key="NSNextResponder" ref="552471306"/> <reference key="NSNextResponder" ref="552471306"/>
@ -940,6 +947,7 @@
<bool key="NSAllowsTickMarkValuesOnly">NO</bool> <bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">YES</bool> <bool key="NSVertical">YES</bool>
</object> </object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</object> </object>
<string key="NSFrameSize">{45, 125}</string> <string key="NSFrameSize">{45, 125}</string>
@ -1010,14 +1018,6 @@
</object> </object>
<int key="connectionID">62</int> <int key="connectionID">62</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="740908585"/>
</object>
<int key="connectionID">64</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection"> <object class="IBBindingConnection" key="connection">
<string key="label">value: emuControl.statusText</string> <string key="label">value: emuControl.statusText</string>
@ -1559,7 +1559,6 @@
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="731708450"/> <reference ref="731708450"/>
<reference ref="963885183"/> <reference ref="963885183"/>
<reference ref="740908585"/>
<reference ref="154157914"/> <reference ref="154157914"/>
<reference ref="347607109"/> <reference ref="347607109"/>
</object> </object>
@ -1624,14 +1623,6 @@
<reference key="object" ref="281439290"/> <reference key="object" ref="281439290"/>
<reference key="parent" ref="321775728"/> <reference key="parent" ref="321775728"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">63</int>
<reference key="object" ref="740908585"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="parent" ref="1027645320"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">93</int> <int key="objectID">93</int>
<reference key="object" ref="365545800"/> <reference key="object" ref="365545800"/>
@ -1990,7 +1981,6 @@
<string>4.IBPluginDependency</string> <string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string> <string>5.IBPluginDependency</string>
<string>6.IBPluginDependency</string> <string>6.IBPluginDependency</string>
<string>63.IBPluginDependency</string>
<string>93.IBPluginDependency</string> <string>93.IBPluginDependency</string>
<string>94.IBPluginDependency</string> <string>94.IBPluginDependency</string>
<string>95.IBPluginDependency</string> <string>95.IBPluginDependency</string>
@ -2071,7 +2061,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="unlocalizedProperties"> <object class="NSMutableDictionary" key="unlocalizedProperties">
@ -2095,14 +2084,6 @@
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">DisplayView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="782611719">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">userinterface/DisplayWindowController.h</string>
</object>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">DisplayWindowController</string> <string key="className">DisplayWindowController</string>
<string key="superclassName">NSWindowController</string> <string key="superclassName">NSWindowController</string>
@ -2115,6 +2096,7 @@
<string>changeDisplayMode:</string> <string>changeDisplayMode:</string>
<string>changeDisplayOrder:</string> <string>changeDisplayOrder:</string>
<string>changeDisplayOrientation:</string> <string>changeDisplayOrientation:</string>
<string>changeDisplayVideoSource:</string>
<string>changeHardwareMicGain:</string> <string>changeHardwareMicGain:</string>
<string>changeHardwareMicMute:</string> <string>changeHardwareMicMute:</string>
<string>changeRotation:</string> <string>changeRotation:</string>
@ -2141,7 +2123,6 @@
<string>toggleShowHUDRender3DFPS:</string> <string>toggleShowHUDRender3DFPS:</string>
<string>toggleShowHUDVideoFPS:</string> <string>toggleShowHUDVideoFPS:</string>
<string>toggleStatusBar:</string> <string>toggleStatusBar:</string>
<string>toggleVerticalSync:</string>
<string>toggleVideoFiltersPreferGPU:</string> <string>toggleVideoFiltersPreferGPU:</string>
<string>toggleVideoSourceDeposterize:</string> <string>toggleVideoSourceDeposterize:</string>
<string>writeDefaultsDisplayGap:</string> <string>writeDefaultsDisplayGap:</string>
@ -2200,6 +2181,7 @@
<string>changeDisplayMode:</string> <string>changeDisplayMode:</string>
<string>changeDisplayOrder:</string> <string>changeDisplayOrder:</string>
<string>changeDisplayOrientation:</string> <string>changeDisplayOrientation:</string>
<string>changeDisplayVideoSource:</string>
<string>changeHardwareMicGain:</string> <string>changeHardwareMicGain:</string>
<string>changeHardwareMicMute:</string> <string>changeHardwareMicMute:</string>
<string>changeRotation:</string> <string>changeRotation:</string>
@ -2226,7 +2208,6 @@
<string>toggleShowHUDRender3DFPS:</string> <string>toggleShowHUDRender3DFPS:</string>
<string>toggleShowHUDVideoFPS:</string> <string>toggleShowHUDVideoFPS:</string>
<string>toggleStatusBar:</string> <string>toggleStatusBar:</string>
<string>toggleVerticalSync:</string>
<string>toggleVideoFiltersPreferGPU:</string> <string>toggleVideoFiltersPreferGPU:</string>
<string>toggleVideoSourceDeposterize:</string> <string>toggleVideoSourceDeposterize:</string>
<string>writeDefaultsDisplayGap:</string> <string>writeDefaultsDisplayGap:</string>
@ -2256,6 +2237,10 @@
<string key="name">changeDisplayOrientation:</string> <string key="name">changeDisplayOrientation:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">changeDisplayVideoSource:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">changeHardwareMicGain:</string> <string key="name">changeHardwareMicGain:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
@ -2360,10 +2345,6 @@
<string key="name">toggleStatusBar:</string> <string key="name">toggleStatusBar:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
</object> </object>
<object class="IBActionInfo">
<string key="name">toggleVerticalSync:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo"> <object class="IBActionInfo">
<string key="name">toggleVideoFiltersPreferGPU:</string> <string key="name">toggleVideoFiltersPreferGPU:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>
@ -2401,7 +2382,6 @@
<string>outputVolumeControlView</string> <string>outputVolumeControlView</string>
<string>outputVolumeMenuItem</string> <string>outputVolumeMenuItem</string>
<string>saveScreenshotPanelAccessoryView</string> <string>saveScreenshotPanelAccessoryView</string>
<string>view</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -2412,7 +2392,6 @@
<string>NSView</string> <string>NSView</string>
<string>NSMenuItem</string> <string>NSMenuItem</string>
<string>NSView</string> <string>NSView</string>
<string>DisplayView</string>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> <object class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -2426,7 +2405,6 @@
<string>outputVolumeControlView</string> <string>outputVolumeControlView</string>
<string>outputVolumeMenuItem</string> <string>outputVolumeMenuItem</string>
<string>saveScreenshotPanelAccessoryView</string> <string>saveScreenshotPanelAccessoryView</string>
<string>view</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@ -2458,13 +2436,12 @@
<string key="name">saveScreenshotPanelAccessoryView</string> <string key="name">saveScreenshotPanelAccessoryView</string>
<string key="candidateClassName">NSView</string> <string key="candidateClassName">NSView</string>
</object> </object>
<object class="IBToOneOutletInfo">
<string key="name">view</string>
<string key="candidateClassName">DisplayView</string>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">userinterface/DisplayWindowController.h</string>
</object> </object>
<reference key="sourceIdentifier" ref="782611719"/>
</object> </object>
</object> </object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
@ -3013,6 +2990,10 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/> <integer value="1050" key="NS.object.0"/>
</object> </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3100" key="NS.object.0"/> <integer value="3100" key="NS.object.0"/>
@ -3052,8 +3033,8 @@
<string>{420, 420}</string> <string>{420, 420}</string>
<string>{420, 420}</string> <string>{420, 420}</string>
<string>{16, 16}</string> <string>{16, 16}</string>
<string>{9, 8}</string> <string>{11, 11}</string>
<string>{7, 2}</string> <string>{10, 3}</string>
<string>{15, 15}</string> <string>{15, 15}</string>
</object> </object>
</object> </object>

4
desmume/src/frontend/cocoa/userinterface/DisplayWindowController.h
View File

@ -92,7 +92,6 @@ class OGLVideoOutput;
{ {
NSObject *dummyObject; NSObject *dummyObject;
DisplayView *view;
ClientDisplayViewProperties _localViewProps; ClientDisplayViewProperties _localViewProps;
NSView *saveScreenshotPanelAccessoryView; NSView *saveScreenshotPanelAccessoryView;
NSView *outputVolumeControlView; NSView *outputVolumeControlView;
@ -102,6 +101,7 @@ class OGLVideoOutput;
NSSlider *microphoneGainSlider; NSSlider *microphoneGainSlider;
NSButton *microphoneMuteButton; NSButton *microphoneMuteButton;
DisplayView *view;
EmuControllerDelegate *emuControl; EmuControllerDelegate *emuControl;
CocoaDSDisplayVideo *cdsVideoOutput; CocoaDSDisplayVideo *cdsVideoOutput;
NSScreen *assignedScreen; NSScreen *assignedScreen;
@ -123,7 +123,6 @@ class OGLVideoOutput;
@property (readonly) IBOutlet NSObject *dummyObject; @property (readonly) IBOutlet NSObject *dummyObject;
@property (readonly) IBOutlet DisplayView *view;
@property (readonly) IBOutlet NSView *saveScreenshotPanelAccessoryView; @property (readonly) IBOutlet NSView *saveScreenshotPanelAccessoryView;
@property (readonly) IBOutlet NSView *outputVolumeControlView; @property (readonly) IBOutlet NSView *outputVolumeControlView;
@property (readonly) IBOutlet NSView *microphoneGainControlView; @property (readonly) IBOutlet NSView *microphoneGainControlView;
@ -132,6 +131,7 @@ class OGLVideoOutput;
@property (readonly) IBOutlet NSSlider *microphoneGainSlider; @property (readonly) IBOutlet NSSlider *microphoneGainSlider;
@property (readonly) IBOutlet NSButton *microphoneMuteButton; @property (readonly) IBOutlet NSButton *microphoneMuteButton;
@property (retain) DisplayView *view;
@property (retain) EmuControllerDelegate *emuControl; @property (retain) EmuControllerDelegate *emuControl;
@property (retain) CocoaDSDisplayVideo *cdsVideoOutput; @property (retain) CocoaDSDisplayVideo *cdsVideoOutput;
@property (assign) NSScreen *assignedScreen; @property (assign) NSScreen *assignedScreen;

7
desmume/src/frontend/cocoa/userinterface/DisplayWindowController.mm
View File

@ -94,6 +94,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
return self; return self;
} }
view = nil;
emuControl = [theEmuController retain]; emuControl = [theEmuController retain];
cdsVideoOutput = nil; cdsVideoOutput = nil;
assignedScreen = nil; assignedScreen = nil;
@ -142,6 +143,7 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
[self setEmuControl:nil]; [self setEmuControl:nil];
[self setAssignedScreen:nil]; [self setAssignedScreen:nil];
[self setView:nil];
[self setMasterWindow:nil]; [self setMasterWindow:nil];
[self setCdsVideoOutput:nil]; [self setCdsVideoOutput:nil];
@ -1350,9 +1352,14 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
- (void)windowDidLoad - (void)windowDidLoad
{ {
NSRect newViewFrameRect = NSMakeRect(0.0f, (CGFloat)_statusBarHeight, (CGFloat)_localViewProps.clientWidth, (CGFloat)_localViewProps.clientHeight);
DisplayView *newView = [[[DisplayView alloc] initWithFrame:newViewFrameRect] autorelease];
[self setView:newView];
// Set up the master window that is associated with this window controller. // Set up the master window that is associated with this window controller.
[self setMasterWindow:[self window]]; [self setMasterWindow:[self window]];
[masterWindow setTitle:(NSString *)[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]]; [masterWindow setTitle:(NSString *)[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"]];
[[masterWindow contentView] addSubview:view];
[masterWindow setInitialFirstResponder:view]; [masterWindow setInitialFirstResponder:view];
[[emuControl windowList] addObject:self]; [[emuControl windowList] addObject:self];
[emuControl updateAllWindowTitles]; [emuControl updateAllWindowTitles];