even more reformatting

[wxWidgets.git] / src / mac / carbon / dirdlg.cpp

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 2150002e4292be2a39989e8ccd32d31a83f028d3..be7e5c6aa69c759d35ab6ab778590ba917810e02 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dirdlg.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG


@@ -50,57 +46,65 @@ wxDirDialog::wxDirDialog(wxWindow *parent,
 
 int wxDirDialog::ShowModal()
 {
 
 int wxDirDialog::ShowModal()
 {

-    NavDialogOptions        mNavOptions;
-    NavObjectFilterUPP      mNavFilterUPP = NULL;
-    NavReplyRecord          mNavReply;
-
-    ::NavGetDefaultDialogOptions(&mNavOptions);
-
-    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
-
-    OSErr err = ::NavChooseFolder(
-                        NULL,
-                        &mNavReply,
-                        &mNavOptions,
-                        NULL,
-                        mNavFilterUPP,
-                        0L);                            // User Data
-
-    if ( (err != noErr) && (err != userCanceledErr) ) {
-        m_path = wxEmptyString ;
-        return wxID_CANCEL ;
+    NavDialogRef dialog;
+    NavDialogCreationOptions options;
+    NavReplyRecord reply ;
+    bool disposeReply = false ;
+    OSStatus err = noErr;
+    
+    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 (mNavReply.validRecord) {        // User chose a folder
-
-        FSRef folderInfo;
-        AEDesc specDesc ;
-
-        OSErr err = ::AECoerceDesc( &mNavReply.selection , typeFSRef, &specDesc);
-        if ( err != noErr ) {
-            m_path = wxEmptyString ;
-            return wxID_CANCEL ;
+    
+    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);
+                }            
+            }

         }
         }

-        folderInfo = **(FSRef**) specDesc.dataHandle;
-        if (specDesc.dataHandle != nil) {
-            ::AEDisposeDesc(&specDesc);
+        else
+        {
+            err = paramErr ; // could be any error, only used for giving back wxID_CANCEL

         }
         }

-
-        m_path = wxMacFSRefToPath( &folderInfo ) ;
-        return wxID_OK ;

     }
     }

-    return wxID_CANCEL;
+    
+    if ( disposeReply )
+        ::NavDisposeReply(&reply);
+    
+    // apparently cancelling shouldn't change m_path
+    if ( err != noErr && err != userCanceledErr )
+        m_path = wxEmptyString ;
+    
+    return (err == noErr) ? wxID_OK : wxID_CANCEL ;

 }
 
 #endif
 }
 
 #endif