Cocoa Port:

- Fix display window restoration on startup if building the app with an OS X SDK earlier than v10.7. (Regression from r5349.)

desmume/src/cocoa/userinterface/DisplayWindowController.h

@@ -159,13 +159,13 @@ class OGLVideoOutput;
 - (id)initWithWindowNibName:(NSString *)windowNibName emuControlDelegate:(EmuControllerDelegate *)theEmuController;
 
 - (void) setupUserDefaults;
+- (BOOL) masterStatusBarState;
+- (NSRect) masterWindowFrame;
+- (double) masterWindowScale;
 - (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees;
 - (double) maxScalarForContentBoundsWidth:(double)contentBoundsWidth height:(double)contentBoundsHeight;
 - (void) enterFullScreen;
 - (void) exitFullScreen;
-- (BOOL) masterStatusBarState;
-- (NSRect) masterWindowFrame;
-- (double) masterWindowScale;
 
 - (IBAction) copy:(id)sender;
 - (IBAction) changeHardwareMicGain:(id)sender;

desmume/src/cocoa/userinterface/DisplayWindowController.mm

@@ -522,6 +522,21 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 	return normalSize;
 }
 
+- (BOOL) masterStatusBarState
+{
+	return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [self isShowingStatusBar] : _masterStatusBarState;
+}
+
+- (NSRect) masterWindowFrame
+{
+	return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [masterWindow frame] : _masterWindowFrame;
+}
+
+- (double) masterWindowScale
+{
+	return (([self assignedScreen] == nil) || !_useMavericksFullScreen) ? [self displayScale] : _masterWindowScale;
+}
+
 - (double) resizeWithTransform:(NSSize)normalBounds scalar:(double)scalar rotation:(double)angleDegrees
 {
 	if ([self assignedScreen] != nil)
@@ -1463,21 +1478,6 @@ static std::unordered_map<NSScreen *, DisplayWindowController *> _screenMap; //
 	}
 }
 
-- (BOOL) masterStatusBarState
-{
-	return ([self assignedScreen] == nil) ? [self isShowingStatusBar] : _masterStatusBarState;
-}
-
-- (NSRect) masterWindowFrame
-{
-	return ([self assignedScreen] == nil) ? [masterWindow frame] : _masterWindowFrame;
-}
-
-- (double) masterWindowScale
-{
-	return ([self assignedScreen] == nil) ? [self displayScale] : _masterWindowScale;
-}
-
 #endif
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem