From 3f15f30f8fe383f70f720a51bf44c8bf6ad9bbfa Mon Sep 17 00:00:00 2001 From: Alexander Strange Date: Wed, 12 Oct 2011 17:31:40 -0400 Subject: [PATCH] Make it compile with Xcode 4.2 --- AdvancedPreference.xib | 1068 ++++++++++------------------------------ Menu.xib | 125 +++-- 2 files changed, 306 insertions(+), 887 deletions(-) diff --git a/AdvancedPreference.xib b/AdvancedPreference.xib index a430bad..881b3bb 100644 --- a/AdvancedPreference.xib +++ b/AdvancedPreference.xib @@ -1,34 +1,35 @@ - + - 1050 - 10B504 - 740 - 1038.2 - 437.00 + 1060 + 11C74 + 1938 + 1138.23 + 567.00 com.apple.InterfaceBuilder.CocoaPlugin - 740 + 1938 - - YES - - - - YES + + NSCustomObject + NSTextField + NSTextFieldCell + NSSliderCell + NSCustomView + NSSlider + NSButtonCell + NSUserDefaultsController + NSButton + NSBox + + com.apple.InterfaceBuilder.CocoaPlugin - + - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + - - YES + NESAdvancedPreference @@ -41,18 +42,15 @@ 268 - - YES + 36 - - YES + - 256 - - YES + 274 + 270 @@ -406,11 +404,11 @@ - + {{1, 1}, {423, 301}} - + {{17, 16}, {425, 303}} {0, 0} @@ -466,7 +464,7 @@ 25 - + {459, 352} NSView @@ -474,10 +472,9 @@ YES - + - - YES + view @@ -486,6 +483,26 @@ 2 + + + value: NESNTSC + + + + + + value: NESNTSC + value + NESNTSC + + NSValidatesImmediately + + + 2 + + + 18 + enabled: NESNTSC @@ -524,39 +541,39 @@ - value: NESNTSC - + enabled: NESNTSC + - + - value: NESNTSC - value + enabled: NESNTSC + enabled NESNTSC - - NSValidatesImmediately - - 2 - 18 + 54 - enabled: NESNTSC + value: NESSaturation - enabled: NESNTSC - enabled - NESNTSC + value: NESSaturation + value + NESSaturation + + NSValidatesImmediately + + 2 - 54 + 73 @@ -576,27 +593,31 @@ - enabled: NESNTSC - + value: NESContrast + - + - enabled: NESNTSC - enabled - NESNTSC + value: NESContrast + value + NESContrast + + NSValidatesImmediately + + 2 - 57 + 76 enabled: NESNTSC - + - + enabled: NESNTSC enabled @@ -604,31 +625,35 @@ 2 - 61 + 57 - enabled: NESNTSC - + value: NESSharpness + - + - enabled: NESNTSC - enabled - NESNTSC + value: NESSharpness + value + NESSharpness + + NSValidatesImmediately + + 2 - 63 + 79 enabled: NESNTSC - + - + enabled: NESNTSC enabled @@ -636,31 +661,35 @@ 2 - 65 + 61 - enabled: NESNTSC - + value: NESColorRes + - + - enabled: NESNTSC - enabled - NESNTSC + value: NESColorRes + value + NESColorRes + + NSValidatesImmediately + + 2 - 67 + 81 enabled: NESNTSC - + - + enabled: NESNTSC enabled @@ -668,39 +697,19 @@ 2 - 70 - - - - value: NESSaturation - - - - - - value: NESSaturation - value - NESSaturation - - NSValidatesImmediately - - - 2 - - - 73 + 63 - value: NESContrast - + value: NESColorBleed + - + - value: NESContrast + value: NESColorBleed value - NESContrast + NESColorBleed NSValidatesImmediately @@ -708,39 +717,35 @@ 2 - 76 + 83 - value: NESSharpness - + enabled: NESNTSC + - + - value: NESSharpness - value - NESSharpness - - NSValidatesImmediately - - + enabled: NESNTSC + enabled + NESNTSC 2 - 79 + 65 - value: NESColorRes - + value: NESColorArtifacts + - + - value: NESColorRes + value: NESColorArtifacts value - NESColorRes + NESColorArtifacts NSValidatesImmediately @@ -748,39 +753,35 @@ 2 - 81 + 85 - value: NESColorBleed - + enabled: NESNTSC + - + - value: NESColorBleed - value - NESColorBleed - - NSValidatesImmediately - - + enabled: NESNTSC + enabled + NESNTSC 2 - 83 + 67 - value: NESColorArtifacts - + value: NESColorFringing + - + - value: NESColorArtifacts + value: NESColorFringing value - NESColorArtifacts + NESColorFringing NSValidatesImmediately @@ -788,27 +789,23 @@ 2 - 85 + 88 - value: NESColorFringing - + enabled: NESNTSC + - + - value: NESColorFringing - value - NESColorFringing - - NSValidatesImmediately - - + enabled: NESNTSC + enabled + NESNTSC 2 - 88 + 70 @@ -830,13 +827,12 @@ 90 - + - - YES + 0 - + @@ -861,11 +857,10 @@ 1 - - YES + - + @@ -876,8 +871,7 @@ 91 - - YES + @@ -896,16 +890,15 @@ - + 23 - - YES + - + @@ -916,10 +909,9 @@ 21 - - YES + - + @@ -930,10 +922,9 @@ 32 - - YES + - + @@ -944,10 +935,9 @@ 5 - - YES + - + @@ -958,10 +948,9 @@ 24 - - YES + - + @@ -972,10 +961,9 @@ 19 - - YES + - + @@ -986,10 +974,9 @@ 26 - - YES + - + @@ -1000,10 +987,9 @@ 31 - - YES + - + @@ -1014,10 +1000,9 @@ 6 - - YES + - + @@ -1028,10 +1013,9 @@ 25 - - YES + - + @@ -1042,10 +1026,9 @@ 33 - - YES + - + @@ -1056,10 +1039,9 @@ 30 - - YES + - + @@ -1070,10 +1052,9 @@ 34 - - YES + - + @@ -1084,10 +1065,9 @@ 22 - - YES + - + @@ -1098,10 +1078,9 @@ 27 - - YES + - + @@ -1112,10 +1091,9 @@ 29 - - YES + - + @@ -1126,10 +1104,9 @@ 28 - - YES + - + @@ -1140,10 +1117,9 @@ 20 - - YES + - + @@ -1154,10 +1130,9 @@ 3 - - YES + - + @@ -1165,617 +1140,76 @@ - - - - YES - - YES - -3.IBPluginDependency - 1.IBEditorWindowLastContentRect - 1.IBPluginDependency - 1.WindowOrigin - 1.editorWindowContentRectSynchronizationRect - 19.IBPluginDependency - 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency - 27.IBPluginDependency - 28.IBPluginDependency - 29.IBPluginDependency - 3.IBPluginDependency - 30.IBPluginDependency - 31.IBPluginDependency - 32.IBPluginDependency - 33.IBPluginDependency - 34.IBPluginDependency - 35.IBPluginDependency - 36.IBPluginDependency - 37.IBPluginDependency - 38.IBPluginDependency - 39.IBPluginDependency - 4.IBPluginDependency - 40.IBPluginDependency - 41.IBPluginDependency - 42.IBPluginDependency - 43.IBPluginDependency - 44.IBPluginDependency - 45.IBPluginDependency - 46.IBPluginDependency - 47.IBPluginDependency - 48.IBPluginDependency - 49.IBPluginDependency - 5.IBPluginDependency - 50.IBPluginDependency - 58.IBPluginDependency - 6.IBPluginDependency - 7.IBPluginDependency - 8.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - {{631, 404}, {459, 352}} - com.apple.InterfaceBuilder.CocoaPlugin - {628, 654} - {{217, 442}, {480, 272}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - YES - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + - - YES - - - YES - - + 91 - - - YES - - NESAdvancedPreference - OEPreferenceViewController - - IBProjectSource - NESAdvancedPreference.h - - - - - YES - - OEPreferenceViewController - NSViewController - - IBDocumentRelativeSource - ../OpenEmu/OEPreferenceViewController.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSController - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSController.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSSlider - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSlider.h - - - - NSSliderCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSliderCell.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSUserDefaultsController - NSController - - IBFrameworkSource - AppKit.framework/Headers/NSUserDefaultsController.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSViewController - NSResponder - - view - NSView - - - IBFrameworkSource - AppKit.framework/Headers/NSViewController.h - - - - + 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES - Nestopia.xcodeproj 3 + + NSSwitch + {15, 15} + diff --git a/Menu.xib b/Menu.xib index c84e45d..368981b 100644 --- a/Menu.xib +++ b/Menu.xib @@ -1,21 +1,27 @@ - + - 1050 - 9F33 - 670 - 949.34 - 352.00 - - YES + 1060 + 11C74 + 1938 + 1138.23 + 567.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 - - YES - com.apple.InterfaceBuilderKit + + NSMenuItem + NSCustomObject + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + - - YES + NSApplication @@ -52,103 +58,82 @@ - + - - YES - + - - YES + 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application 465 - + 466 - + 467 - + - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency - 467.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - YES - - - YES - + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + - - YES - - YES - - - YES - - + 467 0 - Nestopia.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 + + {9, 8} + {7, 2} +