Make wxPASSWORD and wxPROCESS_ENTER really deprecated.

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

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index 822047c4df77959324851629b1b724396c1a2029..a17768a61b251fa591e50888e64a135f9a1f1cbf 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -9,10 +9,6 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dirdlg.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_DIRDLG
@@ -22,6 +18,7 @@
 #include "wx/dirdlg.h"
 
 #include "wx/cmndata.h"
+#include "wx/filename.h"
 
 #include "wx/mac/private.h"
 
@@ -33,6 +30,34 @@
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
+static pascal void NavEventProc(
+                                NavEventCallbackMessage inSelector,
+                                NavCBRecPtr ioParams,
+                                NavCallBackUserData ioUserData );
+
+static NavEventUPP sStandardNavEventFilter = NewNavEventUPP(NavEventProc);
+
+static pascal void NavEventProc(
+                                NavEventCallbackMessage inSelector,
+                                NavCBRecPtr ioParams,
+                                NavCallBackUserData ioUserData )
+{
+    wxDirDialog * data = ( wxDirDialog *) ioUserData ;
+    if ( inSelector == kNavCBStart )
+    {
+        if (data && !data->GetPath().IsEmpty() )
+        {
+            // Set default location for the modern Navigation APIs
+            // Apple Technical Q&A 1151
+            FSSpec theFSSpec;
+            wxMacFilename2FSSpec(data->GetPath(), &theFSSpec);
+            AEDesc theLocation = { typeNull, NULL };
+            if (noErr == ::AECreateDesc(typeFSS, &theFSSpec, sizeof(FSSpec), &theLocation))
+                ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
+        }
+    }
+}
+
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
@@ -61,7 +86,7 @@ int wxDirDialog::ShowModal()
     {
         wxMacCFStringHolder message(m_message, m_font.GetEncoding());
         options.message = message;
-        err = NavCreateChooseFolderDialog(&options, NULL, NULL, NULL, &dialog);
+        err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
         if (err == noErr) 
         {        
             err = NavDialogRun(dialog);