+// CocoaFileDialog.mm - Cocoa implementation of file-dialog interface
+
+// Copyright (C) 2013 James Turner <zakalawe@mac.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//
#include "CocoaFileDialog.hxx"
-// bring it all in!
-#include <Cocoa/Cocoa.h>
+#include <AppKit/NSSavePanel.h>
+#include <AppKit/NSOpenPanel.h>
#include <boost/foreach.hpp>
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/strutils.hxx>
+#include <GUI/CocoaHelpers_private.h>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
#include <Viewer/renderer.hxx>
-static NSString* stdStringToCocoa(const std::string& s)
-{
- return [NSString stringWithUTF8String:s.c_str()];
-}
-
-static NSURL* pathToNSURL(const SGPath& aPath)
-{
- return [NSURL fileURLWithPath:stdStringToCocoa(aPath.str())];
-}
+// 10.6 compiler won't accept block-scoped locals in Objective-C++,
+// so making these globals.
+static NSString* completion_path = nil;
+static SGPath completion_sgpath;
class CocoaFileDialog::CocoaFileDialogPrivate
{
[d->panel beginSheetModalForWindow:cocoaWindow completionHandler:^(NSInteger result)
{
- NSString* path = nil;
- SGPath sgpath;
-
if (result == NSFileHandlingPanelOKButton) {
- path = [[d->panel URL] path];
+ completion_path = [[d->panel URL] path];
//NSLog(@"the URL is: %@", d->panel URL]);
- sgpath = ([path UTF8String]);
- _callback->onFileDialogDone(this, sgpath);
+ completion_sgpath = ([completion_path UTF8String]);
+ _callback->onFileDialogDone(this, completion_sgpath);
}
}];
}