fly/flightgear
1
0
Fork 0
Code Activity

Tolerate old blocks support in 10.6 compiler.

Browse source
This commit is contained in:
James Turner 2013-01-22 18:33:16 +01:00
parent 13303f96a1
commit a31c2d519c
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/GUI/CocoaFileDialog.mm
View file

@ -27,6 +27,11 @@ 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
{
public:
@ -117,14 +122,11 @@ void CocoaFileDialog::exec()
[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);
}
}];
}