#include "wx/wxprec.h"
+#if wxUSE_FILEDLG
+
#include "wx/filedlg.h"
#ifndef WX_PRECOMP
{
// Set default location for the modern Navigation APIs
// Apple Technical Q&A 1151
- FSSpec theFSSpec;
- wxMacFilename2FSSpec(data->defaultLocation, &theFSSpec);
+ FSRef theFile;
+ wxMacPathToFSRef(data->defaultLocation, &theFile);
AEDesc theLocation = { typeNull, NULL };
- if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
+ if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
}
NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
if ( !theInfo->isFolder )
{
- if (theItem->descriptorType == typeFSS)
- {
- FSSpec spec;
- memcpy( &spec , *theItem->dataHandle , sizeof(FSSpec) ) ;
- wxString file = wxMacMakeStringFromPascal( spec.name ) ;
- display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
- }
- else if ( theItem->descriptorType == typeFSRef )
+ AECoerceDesc (theItem, typeFSRef, theItem);
+
+ FSRef fsref ;
+ if ( AEGetDescData (theItem, &fsref, sizeof (FSRef)) == noErr )
{
- FSRef fsref ;
memcpy( &fsref , *theItem->dataHandle , sizeof(FSRef) ) ;
wxString file = wxMacFSRefToPath( &fsref ) ;
display = CheckFile( file , theInfo->fileAndFolder.fileInfo.finderInfo.fdType , data ) ;
}
}
- if (HasFlag(wxFD_SAVE))
+ if (HasFdFlag(wxFD_SAVE))
{
myData.saveMode = true;
if (err != noErr)
break;
- if (HasFlag(wxFD_SAVE))
+ if (HasFdFlag(wxFD_SAVE))
thePath = wxMacFSRefToPath( &theFSRef, navReply.saveFileName );
else
thePath = wxMacFSRefToPath( &theFSRef );
return (err == noErr) ? wxID_OK : wxID_CANCEL;
}
+
+#endif // wxUSE_FILEDLG
+