From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 11 Mar 2003 19:52:48 +0000 (+0000)
Subject: moved fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7ed2b47bf5c96d3da2b28543d5a7aec3d7197959

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 b2a2cb2406..5a65441f23 100644
--- 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 b2a2cb2406..5a65441f23 100644
--- 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 ;