conforming to deprecation recommendation for 10.6

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2011-02-16 16:10:30 +00:00
parent 5411e35f7b
commit 075386e6e7

View File

@ -200,9 +200,8 @@ void wxFileDialog::ShowWindowModal()
[oPanel setResolvesAliases:YES];
[oPanel setCanChooseFiles:YES];
[oPanel setMessage:cf.AsNSString()];
if ( HasFlag(wxFD_MULTIPLE) )
[oPanel setAllowsMultipleSelection:YES];
[oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
NSWindow* nativeParent = parentWindow->GetWXWindow();
ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
[sheetDelegate setImplementation: this];
@ -298,11 +297,20 @@ int wxFileDialog::ShowModal()
[oPanel setResolvesAliases:YES];
[oPanel setCanChooseFiles:YES];
[oPanel setMessage:cf.AsNSString()];
if ( HasFlag(wxFD_MULTIPLE) )
[oPanel setAllowsMultipleSelection:YES];
[oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
returnCode = [oPanel runModalForDirectory:dir.AsNSString()
if ( UMAGetSystemVersion() < 0x1060 )
{
returnCode = [oPanel runModalForDirectory:dir.AsNSString()
file:file.AsNSString() types:types];
}
else
{
[oPanel setAllowedFileTypes:types];
[oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString()
isDirectory:YES]];
returnCode = [oPanel runModal];
}
ModalFinishedCallback(oPanel, returnCode);