Applied #9520: Fix to allow repeated use of wxFileDialog object

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

diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index 9ffded74f3e15fd665da5384d0e4786928feab29..2b670be8d6d6f7f4eee369087ee4545b32ef5210 100644 (file)
--- a/src/osx/carbon/filedlg.cpp
+++ b/src/osx/carbon/filedlg.cpp
@@ -292,6 +292,9 @@ pascal Boolean CrossPlatformFilterCallback(
 
 int wxFileDialog::ShowModal()
 {
 
 int wxFileDialog::ShowModal()
 {

+    m_paths.Empty();
+    m_fileNames.Empty();
+    

     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
 
     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
 

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index 33ece870253945a8d0389d5b6fdad8ce9562491f..727e9fe1a3e635273fc8fd0c1fd398104d441a18 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -153,6 +153,7 @@ int wxFileDialog::ShowModal()
 
     m_path = wxEmptyString;
     m_fileNames.Clear();
 
     m_path = wxEmptyString;
     m_fileNames.Clear();

+    m_paths.Clear();

 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;