(OSX) Take out settings window for now entirely

This commit is contained in:
neville 2015-06-02 09:00:27 +02:00
parent 956218338b
commit 8151c85980
3 changed files with 1 additions and 11 deletions

View File

@ -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>

View File

@ -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;

View File

@ -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