From 8151c85980815a8122e3cb225300293ecb369660 Mon Sep 17 00:00:00 2001
From: neville <neville@nevilles-powerbook-g4-15.local>
Date: Tue, 2 Jun 2015 09:00:27 +0200
Subject: [PATCH] (OSX) Take out settings window for now entirely

---
 gfx/drivers_context/cocoa_gl_ctx.m | 2 +-
 ui/drivers/cocoa/cocoa_common.h    | 1 -
 ui/drivers/ui_cocoa.m              | 9 ---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 5f7a9f97bd..3574fdeea5 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <CoreGraphics/CGGeometry.h>
+#include <ApplicationServices/ApplicationServices.h>
 #if defined(HAVE_COCOA)
 #include <OpenGL/CGLTypes.h>
 #include <OpenGL/OpenGL.h>
diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index 9daedc16ef..3f45917881 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -101,7 +101,6 @@ void get_ios_version(int *major, int *minor);
 @interface RetroArch_OSX : NSObject
 {
    NSWindow* _window;
-   NSWindowController* _settingsWindow;
 }
 
 @property (nonatomic, retain) NSWindow IBOutlet* window;
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 673f7c61f6..6d2fdfe8c8 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -142,19 +142,13 @@ void apple_rarch_exited(void)
 static int waiting_argc;
 static char** waiting_argv;
 
-@interface RetroArch_OSX()
-@property (nonatomic, retain) NSWindowController* settingsWindow;
-@end
-
 @implementation RetroArch_OSX
 
 @synthesize window = _window;
-@synthesize settingsWindow = _settingsWindow;
 
 - (void)dealloc
 {
    [_window release];
-   [_settingsWindow release];
    [super dealloc];
 }
 
@@ -173,8 +167,6 @@ static char** waiting_argv;
    [[self.window contentView] addSubview:[CocoaView get]];
    [self.window makeFirstResponder:[CocoaView get]];
 
-   self.settingsWindow = [[[NSWindowController alloc] initWithWindowNibName:BOXSTRING("Settings")] autorelease];
-   
    if (rarch_main(waiting_argc, waiting_argv, NULL))
       apple_rarch_exited();
 
@@ -318,7 +310,6 @@ static void poll_iteration(void)
 
 - (IBAction)showPreferences:(id)sender
 {
-   [NSApp runModalForWindow:[self.settingsWindow window]];
 }
 
 - (IBAction)basicEvent:(id)sender