OS X:

Fixing a few bugs.
Get rid of a few deprecated notices.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87842 e17a0e51-4ae3-4d35-97c3-1a29b211df97

8 files changed, 56 insertions, 44 deletions

diff --git a/macosx/Base.lproj/PcsxrMemCardDocument.xib b/macosx/Base.lproj/PcsxrMemCardDocument.xib
index 6f1edb78..ceefbfc7 100644
--- a/macosx/Base.lproj/PcsxrMemCardDocument.xib
+++ b/macosx/Base.lproj/PcsxrMemCardDocument.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PcsxrMemCardHandler">
@@ -34,7 +34,7 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="pcsxrmemcard" id="100030"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="100024">
-                        <rect key="frame" x="89" y="122" width="158" height="17"/>
+                        <rect key="frame" x="90" y="122" width="160" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" alignment="left" title="Memory Card Selection" id="100029">
                             <font key="font" metaFont="systemBold"/>
@@ -43,7 +43,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="100025">
-                        <rect key="frame" x="89" y="61" width="314" height="28"/>
+                        <rect key="frame" x="90" y="61" width="312" height="28"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" controlSize="small" alignment="left" title="Select which memory card slot you want to put this card in." id="100028">
                             <font key="font" metaFont="smallSystem"/>
@@ -51,10 +51,10 @@
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100034">
-                        <rect key="frame" x="89" y="97" width="314" height="17"/>
+                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100034" userLabel="Mem card file name">
+                        <rect key="frame" x="90" y="97" width="312" height="17"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" title="Label" id="100035">
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" placeholderString="Mem card file name" id="100035">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -67,6 +67,9 @@
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
                         </buttonCell>
+                        <connections>
+                            <action selector="setMemCard:" target="-2" id="pCv-qx-Aia"/>
+                        </connections>
                     </button>
                     <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="100130">
                         <rect key="frame" x="254" y="13" width="76" height="32"/>
@@ -78,6 +81,9 @@
 DQ
 </string>
                         </buttonCell>
+                        <connections>
+                            <action selector="setMemCard:" target="-2" id="ns5-6p-PxQ"/>
+                        </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="100134">
                         <rect key="frame" x="14" y="13" width="82" height="32"/>
@@ -89,6 +95,9 @@ DQ
 Gw
 </string>
                         </buttonCell>
+                        <connections>
+                            <action selector="setMemCard:" target="-2" id="FQY-lS-5OC"/>
+                        </connections>
                     </button>
                 </subviews>
                 <constraints>
diff --git a/macosx/English.lproj/Base.lproj/AddPluginSheet.xib b/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
index b8e0b0d3..13a6f747 100644
--- a/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
+++ b/macosx/English.lproj/Base.lproj/AddPluginSheet.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1090" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PcsxrPluginHandler">
@@ -17,15 +17,15 @@
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
-            <rect key="contentRect" x="177" y="439" width="420" height="147"/>
+            <rect key="contentRect" x="177" y="439" width="420" height="138"/>
             <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
             <value key="minSize" type="size" width="94" height="7"/>
             <view key="contentView" id="7">
-                <rect key="frame" x="0.0" y="0.0" width="420" height="147"/>
+                <rect key="frame" x="0.0" y="0.0" width="420" height="138"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <imageView translatesAutoresizingMaskIntoConstraints="NO" id="29">
-                        <rect key="frame" x="20" y="63" width="64" height="64"/>
+                        <rect key="frame" x="20" y="54" width="64" height="64"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="64" id="81"/>
@@ -34,7 +34,7 @@
                         <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="psxplugin" id="57"/>
                     </imageView>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="43">
-                        <rect key="frame" x="89" y="110" width="126" height="17"/>
+                        <rect key="frame" x="90" y="101" width="127" height="17"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" alignment="left" title="Plugin Installation" id="58">
                             <font key="font" metaFont="systemBold"/>
@@ -43,7 +43,7 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="44">
-                        <rect key="frame" x="89" y="88" width="248" height="14"/>
+                        <rect key="frame" x="90" y="79" width="247" height="14"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <textFieldCell key="cell" selectable="YES" alignment="left" title="Do you want to install this plugin into PCSXR?" id="59">
                             <font key="font" metaFont="smallSystem"/>
@@ -52,9 +52,9 @@
                         </textFieldCell>
                     </textField>
                     <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="47">
-                        <rect key="frame" x="92" y="58" width="308" height="22"/>
+                        <rect key="frame" x="92" y="49" width="308" height="22"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="60">
+                        <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="60">
                             <font key="font" metaFont="system"/>
                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -85,7 +85,6 @@ Gw
                 </subviews>
                 <constraints>
                     <constraint firstItem="29" firstAttribute="top" secondItem="7" secondAttribute="top" constant="20" symbolic="YES" id="88"/>
-                    <constraint firstItem="43" firstAttribute="top" secondItem="7" secondAttribute="top" constant="20" symbolic="YES" id="94"/>
                     <constraint firstItem="29" firstAttribute="leading" secondItem="7" secondAttribute="leading" constant="20" symbolic="YES" id="101"/>
                     <constraint firstItem="43" firstAttribute="leading" secondItem="29" secondAttribute="trailing" constant="8" symbolic="YES" id="110"/>
                     <constraint firstAttribute="bottom" secondItem="112" secondAttribute="bottom" constant="20" symbolic="YES" id="115"/>
@@ -95,8 +94,10 @@ Gw
                     <constraint firstItem="43" firstAttribute="leading" secondItem="47" secondAttribute="leading" id="G0m-uo-WmB"/>
                     <constraint firstItem="43" firstAttribute="leading" secondItem="44" secondAttribute="leading" id="fb2-Jc-MtO"/>
                     <constraint firstItem="47" firstAttribute="top" secondItem="44" secondAttribute="bottom" constant="8" symbolic="YES" id="nEW-ZE-1vH"/>
+                    <constraint firstItem="116" firstAttribute="top" secondItem="47" secondAttribute="bottom" constant="8" symbolic="YES" id="o3B-PA-sfX"/>
                     <constraint firstItem="44" firstAttribute="top" secondItem="43" secondAttribute="bottom" constant="8" symbolic="YES" id="wXs-74-I05"/>
                     <constraint firstItem="112" firstAttribute="baseline" secondItem="116" secondAttribute="baseline" id="wec-HN-wNe"/>
+                    <constraint firstItem="43" firstAttribute="top" secondItem="29" secondAttribute="top" id="zsa-7M-mIg"/>
                 </constraints>
             </view>
             <connections>
diff --git a/macosx/English.lproj/Base.lproj/Configuration.xib b/macosx/English.lproj/Base.lproj/Configuration.xib
index 9b1c3000..cc407593 100644
--- a/macosx/English.lproj/Base.lproj/Configuration.xib
+++ b/macosx/English.lproj/Base.lproj/Configuration.xib
@@ -593,8 +593,8 @@
                                                 <rect key="frame" x="2" y="2" width="174" height="74"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
-                                                    <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="903">
-                                                        <rect key="frame" x="75" y="7" width="90" height="28"/>
+                                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="903">
+                                                        <rect key="frame" x="76.000000242143869" y="7" width="90" height="28"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES"/>
                                                         <buttonCell key="cell" type="push" title="Configure…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="910">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -616,7 +616,7 @@
                                                         </connections>
                                                     </button>
                                                     <popUpButton verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="905">
-                                                        <rect key="frame" x="11" y="36" width="153" height="26"/>
+                                                        <rect key="frame" x="11" y="36" width="153.00000024214387" height="26"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                                         <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingMiddle" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="906">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m
index ec216922..ae7ea0a3 100755
--- a/macosx/PcsxrMemCardHandler.m
+++ b/macosx/PcsxrMemCardHandler.m
@@ -43,6 +43,11 @@
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 }
 
+- (NSString*)windowNibName
+{
+	return @"PcsxrMemCardDocument";
+}
+
 - (IBAction)setMemCard:(id)sender
 {
 	memChosen = [sender tag];
@@ -55,17 +60,15 @@
 	if ([EmuThread active]) {
 		return NO;
 	}
-	if (![self window]) {
-		[NSBundle loadNibNamed:@"PcsxrMemCardDocument" owner:self];
-	}
-	[cardPath setObjectValue:[[NSFileManager defaultManager] displayNameAtPath:theFile]];
+	
+	[[cardPath cell] setTitle:[[NSFileManager defaultManager] displayNameAtPath:theFile]];
 	
 	[NSApp runModalForWindow:[self window]];
 	
 	[[self window] orderOut:nil];
 	
 	if (memChosen != 0) {
-		[ConfigurationController setMemoryCard:(int)memChosen toPath:theFile];
+		[ConfigurationController setMemoryCard:memChosen toPath:theFile];
 	}
 	return YES;
 }
diff --git a/macosx/PcsxrPluginHandler.m b/macosx/PcsxrPluginHandler.m
index b10d47b3..2c80cf91 100755
--- a/macosx/PcsxrPluginHandler.m
+++ b/macosx/PcsxrPluginHandler.m
@@ -30,6 +30,11 @@
     return self;
 }
 
+- (NSString*)windowNibName
+{
+	return @"AddPluginSheet";
+}
+
 - (id)init
 {
 	self = [self initWithWindowNibName:@"AddPluginSheet"];
@@ -58,9 +63,6 @@
 	if ([EmuThread active]) {
 		return NO;
 	}
-
-	if (![self window])
-		[NSBundle loadNibNamed:@"AddPluginSheet" owner:self];
 	
 	[pluginName setObjectValue:[theFile lastPathComponent]];
 	
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
index f149eb55..3d5d89e0 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h
@@ -32,7 +32,7 @@ extern PluginWindowController *gameController;
 	
 	NSWindow *fullWindow;
 }
-@property BOOL fullscreen;
+@property (getter = isFullscreen) BOOL fullscreen;
 
 + (id)openGameView;
 - (PluginGLView *)openGLView;
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
index f0b45280..d6ddb17d 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.m
@@ -35,8 +35,12 @@ NSRect windowFrame;
 		}
 		gameWindow = [gameController window];
 	}
+	
 	windowFrame = NSMakeRect(0, 0, iResX + 8, iResY + 4);
 	
+	windowFrame = [NSWindow contentRectForFrameRect:windowFrame styleMask:NSTitledWindowMask];
+
+	
 	if (windowFrame.size.width != 0) {
 		[gameWindow setFrame:windowFrame display:NO];
 	}
@@ -63,6 +67,7 @@ NSRect windowFrame;
 	if (fullWindow) {
 		[fullWindow orderOut:self];
 	}
+	fullWindow = nil;
 	
 	windowFrame = [[self window] frame];
 }
@@ -75,14 +80,14 @@ NSRect windowFrame;
 
 - (void)mouseDown:(NSEvent *)theEvent
 {
-	if ([self fullscreen]) {
+	if (self.fullscreen) {
 		[self setFullscreen:NO];
 	}
 }
 
-- (BOOL)fullscreen
+- (BOOL)isFullscreen
 {
-	return (fullWindow!=nil);
+	return (fullWindow != nil);
 }
 
 - (void)setFullscreen:(BOOL)flag
@@ -164,7 +169,7 @@ NSRect windowFrame;
 
 - (BOOL)windowShouldZoom:(NSWindow *)sender toFrame:(NSRect)newFrame
 {
-	[self setFullscreen:YES];
+	self.fullscreen = YES;
 	
 	return NO;
 }
@@ -197,14 +202,6 @@ NSRect windowFrame;
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowWantResume" object:self];
 }
 
-//- (void)windowDidBecomeMain:(NSNotification *)aNotification
-/*- (void)windowDidBecomeKey:(NSNotification *)aNotification
-{
-	if (iWindowMode==0) {
-		[self setFullscreen:YES];
-	}
-}*/
-
 - (BOOL)windowShouldClose:(id)sender
 {
 	if (fullWindow) {
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index 97cdf52d..99c4286a 100755
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -203,7 +203,7 @@ void HandleKey(int keycode)
             bSkipNextFrame = FALSE;
             break;
 		case GPU_FULLSCREEN_KEY:
-			[gameController setFullscreen:![gameController fullscreen]];
+			gameController.fullscreen = !gameController.fullscreen;
 			break;
 	}
 }