moved fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index b2a2cb240620e8730a5f22707b4e3a944d81cc5c..5a65441f23848a40d30219aed320d939a04147d9 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -380,13 +380,6 @@ int wxFileDialog::ShowModal()
     AEDesc               mDefaultLocation ;
     bool               mSelectDefault = false ;
         
-    // zero all data
-    
-    m_path = wxEmptyString ;
-    m_fileName = wxEmptyString ;
-    m_paths.Empty();
-    m_fileNames.Empty();
-
     // setup dialog
         
     ::NavGetDefaultDialogOptions(&mNavOptions);
@@ -438,6 +431,13 @@ int wxFileDialog::ShowModal()
     c2pstr((char *)mNavOptions.savedFileName ) ;
 #endif
 
+    // zero all data
+    
+    m_path = wxEmptyString ;
+    m_fileName = wxEmptyString ;
+    m_paths.Empty();
+    m_fileNames.Empty();
+
     OpenUserDataRec            myData;
     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index b2a2cb240620e8730a5f22707b4e3a944d81cc5c..5a65441f23848a40d30219aed320d939a04147d9 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -380,13 +380,6 @@ int wxFileDialog::ShowModal()
     AEDesc               mDefaultLocation ;
     bool               mSelectDefault = false ;
         
-    // zero all data
-    
-    m_path = wxEmptyString ;
-    m_fileName = wxEmptyString ;
-    m_paths.Empty();
-    m_fileNames.Empty();
-
     // setup dialog
         
     ::NavGetDefaultDialogOptions(&mNavOptions);
@@ -438,6 +431,13 @@ int wxFileDialog::ShowModal()
     c2pstr((char *)mNavOptions.savedFileName ) ;
 #endif
 
+    // zero all data
+    
+    m_path = wxEmptyString ;
+    m_fileName = wxEmptyString ;
+    m_paths.Empty();
+    m_fileNames.Empty();
+
     OpenUserDataRec            myData;
     MakeUserDataRec( &myData , m_wildCard ) ;
     myData.currentfilter = m_filterIndex ;