Wow, I feel like an idiot: I didn’t realize there was a setStringValue: in NSTextField. Using that instead of setting the title via the cell.

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

2 files changed, 18 insertions, 12 deletions

diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index 8572289e..bce4a722 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -26,7 +26,7 @@
 #define APP_ID @"net.pcsxr.Bladesio1"
 #define PrefsKey APP_ID @" Settings"
 
-static PluginConfigController *windowController = nil;
+static PluginConfigController *windowController;
 
 #define kSioEnabled @"SIO Enabled"
 #define kSioPort @"Port"
@@ -42,7 +42,7 @@ void AboutDlgProc()
 	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
 	NSAttributedString *credits;
 	if (path) {
-		credits = [[NSAttributedString alloc] initWithPath: path
+		credits = [[NSAttributedString alloc] initWithPath:path
 				documentAttributes:NULL];
 		
 	} else {
@@ -51,8 +51,7 @@ void AboutDlgProc()
 
 	// Get Application Icon
 	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
-	NSSize size = NSMakeSize(64, 64);
-	[icon setSize:size];
+	[icon setSize:NSMakeSize(64, 64)];
 
 	NSDictionary *infoPaneDict =
 	@{@"ApplicationName": [bundle objectForInfoDictionaryKey:@"CFBundleName"],
@@ -188,14 +187,22 @@ void ReadConfig()
 	keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy];
 
 	[enabledButton setState: [keyValues[kSioEnabled] boolValue] ? NSOnState : NSOffState];
-	[[ipAddressField cell] setTitle:keyValues[kSioIPAddress]];
+	[ipAddressField setStringValue:keyValues[kSioIPAddress]];
 	[portField setIntValue:[keyValues[kSioPort] intValue]];
 	
 	switch ([keyValues[kSioPlayer] integerValue]) {
 		default:
-		case PLAYER_DISABLED: [playerMenu selectItemAtIndex:0]; break;
-		case PLAYER_MASTER: [playerMenu selectItemAtIndex:1]; break;
-		case PLAYER_SLAVE: [playerMenu selectItemAtIndex:2]; break;
+		case PLAYER_DISABLED:
+			[playerMenu selectItemAtIndex:0];
+			break;
+			
+		case PLAYER_MASTER:
+			[playerMenu selectItemAtIndex:1];
+			break;
+			
+		case PLAYER_SLAVE:
+			[playerMenu selectItemAtIndex:2];
+			break;
 	}
 	
 	[self toggleEnabled:nil];
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index baa118f8..3fc886d4 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -288,7 +288,7 @@ void ReadConfig(void)
 {
 	self.fragmentPath = _fragmentPath;
 	if (_fragmentPath) {
-		[[fragmentShaderViewablePath cell] setTitle:[fragmentPath lastPathComponent]];
+		[fragmentShaderViewablePath setStringValue:[fragmentPath lastPathComponent]];
 		[fragmentShaderViewablePath setToolTip:[fragmentPath path]];
 	}
 }
@@ -297,7 +297,7 @@ void ReadConfig(void)
 {
 	self.vertexPath = _vertexPath;
 	if (_vertexPath) {
-		[[vertexShaderViewablePath cell] setTitle:[vertexPath lastPathComponent]];
+		[vertexShaderViewablePath setStringValue:[vertexPath lastPathComponent]];
 		[vertexShaderViewablePath setToolTip:[vertexPath path]];
 	}
 }
@@ -307,8 +307,7 @@ void ReadConfig(void)
 	[openPanel setAllowsMultipleSelection:NO];
 	[openPanel setCanChooseDirectories:NO];
 	[openPanel setCanChooseFiles:YES];
-	if ([openPanel runModal] == NSFileHandlingPanelOKButton)
-	{
+	if ([openPanel runModal] == NSFileHandlingPanelOKButton) {
 		if ([sender tag] == 1) {
 			[self setVertexPathInfo:[openPanel URL]];
 		} else {