// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dirdlg.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_DIRDLG
-#include "wx/defs.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/dirdlg.h"
#include <Navigation.h>
#endif
-#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#endif
wxDirDialog::wxDirDialog(wxWindow *parent,
const wxString& message,
int wxDirDialog::ShowModal()
{
- NavDialogOptions mNavOptions;
- NavObjectFilterUPP mNavFilterUPP = NULL;
- NavPreviewUPP mNavPreviewUPP = NULL ;
- NavReplyRecord mNavReply;
- AEDesc* mDefaultLocation = NULL ;
- bool mSelectDefault = false ;
+ NavDialogRef dialog;
+ NavDialogCreationOptions options;
+ NavReplyRecord reply ;
+ bool disposeReply = false ;
+ OSStatus err = noErr;
- ::NavGetDefaultDialogOptions(&mNavOptions);
-
- mNavFilterUPP = nil;
- mNavPreviewUPP = nil;
- mSelectDefault = false;
- mNavReply.validRecord = false;
- mNavReply.replacing = false;
- mNavReply.isStationery = false;
- mNavReply.translationNeeded = false;
- mNavReply.selection.descriptorType = typeNull;
- mNavReply.selection.dataHandle = nil;
- mNavReply.keyScript = smSystemScript;
- mNavReply.fileTranslation = nil;
-
- // Set default location, the location
- // that's displayed when the dialog
- // first appears
+ err = NavGetDefaultDialogCreationOptions(&options);
+ if (err == noErr)
+ {
+ wxMacCFStringHolder message(m_message, m_font.GetEncoding());
+ options.message = message;
+ err = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL, &dialog);
+ if (err == noErr)
+ {
+ err = NavDialogRun(dialog);
+ if ( err == noErr )
+ {
+ err = NavDialogGetReply(dialog, &reply);
+ disposeReply = true ;
+ }
+ }
+ }
- if ( mDefaultLocation ) {
-
- if (mSelectDefault) {
- mNavOptions.dialogOptionFlags |= kNavSelectDefaultLocation;
- } else {
- mNavOptions.dialogOptionFlags &= ~kNavSelectDefaultLocation;
+ if ( err == noErr )
+ {
+ if ( reply.validRecord )
+ {
+ FSRef folderInfo;
+ AEDesc specDesc ;
+
+ OSErr err = ::AECoerceDesc( &reply.selection , typeFSRef, &specDesc);
+ if ( err != noErr )
+ {
+ m_path = wxEmptyString ;
+ }
+ else
+ {
+ folderInfo = **(FSRef**) specDesc.dataHandle;
+ m_path = wxMacFSRefToPath( &folderInfo ) ;
+ if (specDesc.dataHandle != nil)
+ {
+ ::AEDisposeDesc(&specDesc);
+ }
+ }
+ }
+ else
+ {
+ err = paramErr ; // could be any error, only used for giving back wxID_CANCEL
}
}
- OSErr err = ::NavChooseFolder(
- mDefaultLocation,
- &mNavReply,
- &mNavOptions,
- NULL,
- mNavFilterUPP,
- 0L); // User Data
+ if ( disposeReply )
+ ::NavDisposeReply(&reply);
- if ( (err != noErr) && (err != userCanceledErr) ) {
- m_path = wxT("") ;
- return wxID_CANCEL ;
- }
-
- if (mNavReply.validRecord) { // User chose a folder
+ // apparently cancelling shouldn't change m_path
+ if ( err != noErr && err != userCanceledErr )
+ m_path = wxEmptyString ;
- FSRef folderInfo;
- AEDesc specDesc ;
-
- OSErr err = ::AECoerceDesc( &mNavReply.selection , typeFSRef, &specDesc);
- if ( err != noErr ) {
- m_path = wxT("") ;
- return wxID_CANCEL ;
- }
- folderInfo = **(FSRef**) specDesc.dataHandle;
- if (specDesc.dataHandle != nil) {
- ::AEDisposeDesc(&specDesc);
- }
-
- m_path = wxMacFSRefToPath( &folderInfo ) ;
- return wxID_OK ;
- }
- return wxID_CANCEL;
+ return (err == noErr) ? wxID_OK : wxID_CANCEL ;
}
+#endif