fly/flightgear
1
0
Fork 0
Code Activity

Tweaking syntax for 10.6 block locals.

Browse source
This commit is contained in:
James Turner 2013-01-19 18:05:35 +00:00
parent 008a2d65f1
commit c70bd65922
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/GUI/CocoaFileDialog.mm
View file

@ -74,6 +74,7 @@ void CocoaFileDialog::exec()
NSWindow* cocoaWindow = nil; NSWindow* cocoaWindow = nil;
std::vector<osgViewer::GraphicsWindow*> windows; std::vector<osgViewer::GraphicsWindow*> windows;
globals->get_renderer()->getViewer()->getWindows(windows); globals->get_renderer()->getViewer()->getWindows(windows);
BOOST_FOREACH(osgViewer::GraphicsWindow* gw, windows) { BOOST_FOREACH(osgViewer::GraphicsWindow* gw, windows) {
// OSG doesn't use RTTI, so no dynamic cast. Let's check the class type // 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 // using OSG's own system, before we blindly static_cast<> and break
@ -116,10 +117,13 @@ void CocoaFileDialog::exec()
[d->panel beginSheetModalForWindow:cocoaWindow completionHandler:^(NSInteger result) [d->panel beginSheetModalForWindow:cocoaWindow completionHandler:^(NSInteger result)
{ {
NSString* path = nil;
SGPath sgpath;
if (result == NSFileHandlingPanelOKButton) { if (result == NSFileHandlingPanelOKButton) {
NSString* path = [[d->panel URL] path]; path = [[d->panel URL] path];
//NSLog(@"the URL is: %@", d->panel URL]); //NSLog(@"the URL is: %@", d->panel URL]);
SGPath sgpath([path UTF8String]); sgpath = ([path UTF8String]);
_callback->onFileDialogDone(this, sgpath); _callback->onFileDialogDone(this, sgpath);
} }
}]; }];