Moving most of the OS X preferences to auto layout, and all to 10.7.

Changing some lists of independent checkbox buttons to matrices.
Fix a discrepancy between SDL versions 1.2 and 2.0 APIs in OS X's input preferences.

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

2 files changed, 30 insertions, 27 deletions

diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
index 2bc40052..0e09130e 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
@@ -14,11 +14,11 @@
     // uses bindings to magically set user defaults.
     // But you can look at their grandness if you like:
     
-    IBOutlet NSControl *autoFullScreen;
+    IBOutlet NSCell *autoFullScreen;
     IBOutlet NSPopUpButton *ditherMode;
-    IBOutlet NSControl *fpsCounter;
-    IBOutlet NSControl *frameSkipping;
-    IBOutlet NSControl *vSync;
+    IBOutlet NSCell *fpsCounter;
+    IBOutlet NSCell *frameSkipping;
+    IBOutlet NSCell *vSync;
     
     IBOutlet NSControl *proportionalResize;
     IBOutlet NSPopUpButton *fullscreenSize;
@@ -32,15 +32,15 @@
     
     IBOutlet NSPopUpButton *frameBufferEffects;
 
-    IBOutlet NSControl *drawScanlines;
-    IBOutlet NSControl *advancedBlending;
-    IBOutlet NSControl *opaquePass;
-    IBOutlet NSControl *zMaskClipping;
-    IBOutlet NSControl *wireframeOnly;
-    IBOutlet NSControl *blurEffect;
-    IBOutlet NSControl *mjpegDecoder;
-    IBOutlet NSControl *mjpegDecoder15bit;
-	IBOutlet NSControl *gteAccuracy;
+    IBOutlet NSCell *drawScanlines;
+    IBOutlet NSCell *advancedBlending;
+    IBOutlet NSCell *opaquePass;
+    IBOutlet NSCell *zMaskClipping;
+    IBOutlet NSCell *wireframeOnly;
+    IBOutlet NSCell *blurEffect;
+    IBOutlet NSCell *mjpegDecoder;
+    IBOutlet NSCell *mjpegDecoder15bit;
+	IBOutlet NSCell *gteAccuracy;
 	IBOutlet NSColorWell *scanlineColorWell;
 	
 	IBOutlet NSMatrix *hacksMatrix;
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index d84ad6bc..9097ffe8 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -12,6 +12,7 @@
 #include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
 #include "externals.h"
 #import "ARCBridge.h"
+#import "PluginGLView.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -85,20 +86,22 @@ void AboutDlgProc()
 
 void DlgProc()
 {
-	NSWindow *window;
-
-    PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
-	
-	if (windowController == nil) {
-		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
-	}
-	window = [windowController window];
-	
-	/* load values */
-	[windowController loadValues];
-	
-	[window center];
-	[window makeKeyAndOrderFront:nil];
+	RunOnMainThreadSync(^{
+		NSWindow *window;
+		
+		PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
+		
+		if (windowController == nil) {
+			windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
+		}
+		window = [windowController window];
+		
+		/* load values */
+		[windowController loadValues];
+		
+		[window center];
+		[window makeKeyAndOrderFront:nil];
+	});
 }
 
 #define kFPSCounter @"FPS Counter"