From c1e39ae9b382fa380f3ff6cf7e4ec908723e8258 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 11 Mar 2003 20:00:58 +0000 Subject: [PATCH] moved fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/filedlg.cpp | 13 +++++++------ src/mac/filedlg.cpp | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp index e09165fc1d..f290292a75 100644 --- a/src/mac/carbon/filedlg.cpp +++ b/src/mac/carbon/filedlg.cpp @@ -337,12 +337,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); mNavFilterUPP = nil; @@ -389,6 +383,13 @@ int wxFileDialog::ShowModal() strcpy((char *)mNavOptions.savedFileName, m_fileName) ; 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 e09165fc1d..f290292a75 100644 --- a/src/mac/filedlg.cpp +++ b/src/mac/filedlg.cpp @@ -337,12 +337,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); mNavFilterUPP = nil; @@ -389,6 +383,13 @@ int wxFileDialog::ShowModal() strcpy((char *)mNavOptions.savedFileName, m_fileName) ; 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 ;