From 681396b151e7204f87025f8d19b6aa929fac8097 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 17 Jan 2016 18:45:01 +0100 Subject: [PATCH] (OSX) Cleanups --- ui/drivers/ui_cocoa.m | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 482d1e5917..704ef65d81 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -376,8 +376,8 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result) if (!startdir.length) startdir = BOXSTRING("/"); #if defined(MAC_OS_X_VERSION_10_6) - [panel setDirectoryURL:[NSURL fileURLWithPath:startdir]]; [panel setMessage:BOXSTRING("Load Content")]; + [panel setDirectoryURL:[NSURL fileURLWithPath:startdir]]; [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) { [[NSApplication sharedApplication] stopModal]; @@ -385,7 +385,15 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result) }]; [[NSApplication sharedApplication] runModalForWindow:panel]; #else - [panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL]; + [panel setTitle:NSLocalizedString(BOXSTRING("Load Core"), BOXSTRING("open panel"))]; + [panel setDirectory:startdir]; + [panel setCanChooseDirectories:NO]; + [panel setCanChooseFiles:YES]; + [panel setAllowsMultipleSelection:NO]; + [panel setTreatsFilePackagesAsDirectories:NO]; + NSInteger result = [panel runModal]; + if (result == 1) + open_document_handler(panel, result); #endif [g_context makeCurrentContext]; }