GUI support for VIA/Discontinuity

[flightgear.git] / src / GUI / CocoaFileDialog.mm

diff --git a/src/GUI/CocoaFileDialog.mm b/src/GUI/CocoaFileDialog.mm
index 9f15680e211453097f4b859bc16f65b5646a2581..352fa3c15b66844cf0fc02b31fbad5cb8fbb390f 100644 (file)
--- a/src/GUI/CocoaFileDialog.mm
+++ b/src/GUI/CocoaFileDialog.mm
@@ -1,9 +1,27 @@
+// 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>
 
@@ -13,19 +31,15 @@
 #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
 {
@@ -74,6 +88,7 @@ void CocoaFileDialog::exec()
     NSWindow* cocoaWindow = nil;
     std::vector<osgViewer::GraphicsWindow*> windows;
     globals->get_renderer()->getViewer()->getWindows(windows);
+    
     BOOST_FOREACH(osgViewer::GraphicsWindow* gw, windows) {
         // OSG doesn't use RTTI, so no dynamic cast. Let's check the class type
         // using OSG's own system, before we blindly static_cast<> and break
@@ -117,10 +132,10 @@ void CocoaFileDialog::exec()
     [d->panel beginSheetModalForWindow:cocoaWindow completionHandler:^(NSInteger result)
     {
         if (result == NSFileHandlingPanelOKButton) {
-            NSString* path = [[d->panel URL] path];
+            completion_path = [[d->panel URL] path];
             //NSLog(@"the URL is: %@", d->panel URL]);
-            SGPath sgpath([path UTF8String]);
-            _callback->onFileDialogDone(this, sgpath);
+            completion_sgpath = ([completion_path UTF8String]);
+            _callback->onFileDialogDone(this, completion_sgpath);
         }
     }];
 }