[Author: dmaclach]

Fix up the GTM build due to problems with GTMULocalizer.

TBR=thomasvl
DELTA=1128  (713 added, 411 deleted, 4 changed)

3 files changed, 304 insertions, 6 deletions

diff --git a/AppKit/GTMUILocalizerTest.m b/AppKit/GTMUILocalizerTest.m
index 1f87067..bc29099 100644
--- a/AppKit/GTMUILocalizerTest.m
+++ b/AppKit/GTMUILocalizerTest.m
@@ -52,14 +52,8 @@
     = [[GTMUILocalizerTestWindowController alloc] init];
   NSWindow *window = [controller window];
   STAssertNotNil(window, nil);
-  
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
   GTMAssertObjectStateEqualToStateNamed(window,
                                         @"GTMUILocalizerWindow1State", nil);
-#else
-  GTMAssertObjectStateEqualToStateNamed(window,
-                                       @"GTMUILocalizerWindow1State_10_4", nil);
-#endif
   
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
   GTMUILocalizer *localizer = [[GTMUILocalizer alloc] initWithBundle:bundle];
diff --git a/AppKit/TestData/GTMUILocalizerWindow1State_10_4.gtmUTState b/AppKit/TestData/GTMUILocalizerWindow1State.10_4_SDK.gtmUTState
index 84dde80..84dde80 100644
--- a/AppKit/TestData/GTMUILocalizerWindow1State_10_4.gtmUTState
+++ b/AppKit/TestData/GTMUILocalizerWindow1State.10_4_SDK.gtmUTState
diff --git a/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState b/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState
new file mode 100644
index 0000000..ed88b68
--- /dev/null
+++ b/AppKit/TestData/GTMUILocalizerWindow3State.10_4_SDK.gtmUTState
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>$GTMArchive</key>
+	<string>GTMUnitTestingArchive</string>
+	<key>$GTMVersion</key>
+	<integer>1</integer>
+	<key>WindowContent</key>
+	<dict>
+		<key>ViewIsHidden</key>
+		<false/>
+		<key>ViewSubView 0</key>
+		<dict>
+			<key>BoxBorderType</key>
+			<integer>1</integer>
+			<key>BoxTitle</key>
+			<string>Localized Box</string>
+			<key>BoxTitlePosition</key>
+			<integer>2</integer>
+			<key>BoxType</key>
+			<integer>0</integer>
+			<key>ViewIsHidden</key>
+			<false/>
+			<key>ViewSubView 0</key>
+			<dict>
+				<key>ViewIsHidden</key>
+				<false/>
+				<key>ViewSubView 0</key>
+				<dict>
+					<key>ButtonAlternateTitle</key>
+					<string></string>
+					<key>ControlIsEnabled</key>
+					<true/>
+					<key>ControlSelectedCell</key>
+					<dict>
+						<key>CellState</key>
+						<integer>0</integer>
+						<key>CellTag</key>
+						<integer>0</integer>
+						<key>CellTitle</key>
+						<string>Localized Button</string>
+						<key>CellValue</key>
+						<string>0</string>
+					</dict>
+					<key>ControlTag</key>
+					<integer>0</integer>
+					<key>ControlType</key>
+					<string>NSButton</string>
+					<key>ControlValue</key>
+					<string>0</string>
+					<key>ViewIsHidden</key>
+					<false/>
+				</dict>
+				<key>ViewSubView 1</key>
+				<dict>
+					<key>ButtonAlternateTitle</key>
+					<string></string>
+					<key>ControlIsEnabled</key>
+					<true/>
+					<key>ControlSelectedCell</key>
+					<dict>
+						<key>CellState</key>
+						<integer>0</integer>
+						<key>CellTag</key>
+						<integer>0</integer>
+						<key>CellTitle</key>
+						<string>^Button2</string>
+						<key>CellValue</key>
+						<string>0</string>
+					</dict>
+					<key>ControlTag</key>
+					<integer>0</integer>
+					<key>ControlType</key>
+					<string>NSButton</string>
+					<key>ControlValue</key>
+					<string>0</string>
+					<key>ViewIsHidden</key>
+					<false/>
+				</dict>
+			</dict>
+		</dict>
+		<key>ViewSubView 1</key>
+		<dict>
+			<key>ViewIsHidden</key>
+			<false/>
+			<key>ViewSubView 0</key>
+			<dict>
+				<key>ViewIsHidden</key>
+				<false/>
+				<key>ViewSubView 0</key>
+				<dict>
+					<key>ViewIsHidden</key>
+					<false/>
+					<key>ViewSubView 0</key>
+					<dict>
+						<key>ControlIsEnabled</key>
+						<true/>
+						<key>ControlSelectedCell</key>
+						<dict>
+							<key>CellState</key>
+							<integer>0</integer>
+							<key>CellTag</key>
+							<integer>0</integer>
+							<key>CellTitle</key>
+							<string>Localized Label</string>
+							<key>CellValue</key>
+							<string>Localized Label</string>
+						</dict>
+						<key>ControlTag</key>
+						<integer>0</integer>
+						<key>ControlType</key>
+						<string>NSTextField</string>
+						<key>ControlValue</key>
+						<string>Localized Label</string>
+						<key>ViewIsHidden</key>
+						<false/>
+					</dict>
+					<key>ViewSubView 1</key>
+					<dict>
+						<key>ControlIsEnabled</key>
+						<true/>
+						<key>ControlSelectedCell</key>
+						<dict>
+							<key>CellState</key>
+							<integer>1</integer>
+							<key>CellTag</key>
+							<integer>1</integer>
+							<key>CellTitle</key>
+							<string>Localized Radio 1</string>
+							<key>CellValue</key>
+							<string>1</string>
+						</dict>
+						<key>ControlTag</key>
+						<integer>0</integer>
+						<key>ControlType</key>
+						<string>NSMatrix</string>
+						<key>ControlValue</key>
+						<string>1</string>
+						<key>MatrixAllowEmptySelection</key>
+						<false/>
+						<key>MatrixAutosizesCells</key>
+						<true/>
+						<key>MatrixCell 0</key>
+						<dict>
+							<key>CellState</key>
+							<integer>1</integer>
+							<key>CellTag</key>
+							<integer>1</integer>
+							<key>CellTitle</key>
+							<string>Localized Radio 1</string>
+							<key>CellValue</key>
+							<string>1</string>
+						</dict>
+						<key>MatrixCell 1</key>
+						<dict>
+							<key>CellState</key>
+							<integer>0</integer>
+							<key>CellTag</key>
+							<integer>0</integer>
+							<key>CellTitle</key>
+							<string>Localized Radio 2</string>
+							<key>CellValue</key>
+							<string>0</string>
+						</dict>
+						<key>MatrixCellPrototype</key>
+						<dict>
+							<key>CellState</key>
+							<integer>0</integer>
+							<key>CellTag</key>
+							<integer>0</integer>
+							<key>CellTitle</key>
+							<string>Radio</string>
+							<key>CellValue</key>
+							<string>0</string>
+						</dict>
+						<key>MatrixColumnCount</key>
+						<integer>1</integer>
+						<key>MatrixIntercellSpacing</key>
+						<string>{4, 2}</string>
+						<key>MatrixMode</key>
+						<integer>0</integer>
+						<key>MatrixRowCount</key>
+						<integer>2</integer>
+						<key>MatrixSelectionByRect</key>
+						<true/>
+						<key>ViewIsHidden</key>
+						<false/>
+					</dict>
+					<key>ViewSubView 2</key>
+					<dict>
+						<key>ControlIsEnabled</key>
+						<true/>
+						<key>ControlSelectedCell</key>
+						<dict>
+							<key>CellState</key>
+							<integer>0</integer>
+							<key>CellTag</key>
+							<integer>0</integer>
+							<key>CellTitle</key>
+							<string>^Label2</string>
+							<key>CellValue</key>
+							<string>^Label2</string>
+						</dict>
+						<key>ControlTag</key>
+						<integer>0</integer>
+						<key>ControlType</key>
+						<string>NSTextField</string>
+						<key>ControlValue</key>
+						<string>^Label2</string>
+						<key>ViewIsHidden</key>
+						<false/>
+					</dict>
+				</dict>
+			</dict>
+			<key>ViewSubView 1</key>
+			<dict>
+				<key>ControlIsEnabled</key>
+				<false/>
+				<key>ControlTag</key>
+				<integer>0</integer>
+				<key>ControlType</key>
+				<string>NSScroller</string>
+				<key>ViewIsHidden</key>
+				<false/>
+			</dict>
+			<key>ViewSubView 2</key>
+			<dict>
+				<key>ControlIsEnabled</key>
+				<false/>
+				<key>ControlTag</key>
+				<integer>0</integer>
+				<key>ControlType</key>
+				<string>NSScroller</string>
+				<key>ViewIsHidden</key>
+				<false/>
+			</dict>
+		</dict>
+		<key>ViewSubView 2</key>
+		<dict>
+			<key>ViewIsHidden</key>
+			<false/>
+			<key>ViewSubView 0</key>
+			<dict>
+				<key>ButtonAlternateTitle</key>
+				<string></string>
+				<key>ControlIsEnabled</key>
+				<true/>
+				<key>ControlSelectedCell</key>
+				<dict>
+					<key>CellState</key>
+					<integer>1</integer>
+					<key>CellTag</key>
+					<integer>0</integer>
+					<key>CellTitle</key>
+					<string>Localized Checkbox 1</string>
+					<key>CellValue</key>
+					<string>1</string>
+				</dict>
+				<key>ControlTag</key>
+				<integer>0</integer>
+				<key>ControlType</key>
+				<string>NSButton</string>
+				<key>ControlValue</key>
+				<string>1</string>
+				<key>ViewIsHidden</key>
+				<false/>
+			</dict>
+			<key>ViewSubView 1</key>
+			<dict>
+				<key>ButtonAlternateTitle</key>
+				<string></string>
+				<key>ControlIsEnabled</key>
+				<true/>
+				<key>ControlSelectedCell</key>
+				<dict>
+					<key>CellState</key>
+					<integer>1</integer>
+					<key>CellTag</key>
+					<integer>0</integer>
+					<key>CellTitle</key>
+					<string>Localized Checkbox 2</string>
+					<key>CellValue</key>
+					<string>1</string>
+				</dict>
+				<key>ControlTag</key>
+				<integer>0</integer>
+				<key>ControlType</key>
+				<string>NSButton</string>
+				<key>ControlValue</key>
+				<string>1</string>
+				<key>ViewIsHidden</key>
+				<false/>
+			</dict>
+		</dict>
+	</dict>
+	<key>WindowIsMain</key>
+	<false/>
+	<key>WindowIsVisible</key>
+	<false/>
+	<key>WindowTitle</key>
+	<string>Localized Window</string>
+</dict>
+</plist>