really show the window after creation (calling Show(TRUE) doesn't do it any more)

[wxWidgets.git] / src / msw / filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index eb513c4001031f474c90f96922fcb95d22d38730..b8d7c947e5045230502f715327514157b11a8195 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -113,6 +113,11 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
     }
 }
 
     }
 }
 

+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    files = m_fileNames;
+}
+

 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;


@@ -152,13 +157,12 @@ int wxFileDialog::ShowModal()
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }
     {
         msw_flags |= OFN_NOCHANGEDIR;
     }

-/* chris elliott for some reason this does not work usefully if no extension
-   is given, as it test for junk instead of junk.ext
+

     if ( m_dialogStyle & wxOVERWRITE_PROMPT )
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }
     if ( m_dialogStyle & wxOVERWRITE_PROMPT )
     {
         msw_flags |= OFN_OVERWRITEPROMPT;
     }

-*/
+

     OPENFILENAME of;
     wxZeroMemory(of);
 
     OPENFILENAME of;
     wxZeroMemory(of);
 


@@ -336,6 +340,7 @@ int wxFileDialog::ShowModal()
                 dir += _T('\\');
 
             m_path = dir + m_fileName;
                 dir += _T('\\');
 
             m_path = dir + m_fileName;

+            m_filterIndex = (int)of.nFilterIndex - 1;

         }
         else
         {
         }
         else
         {


@@ -363,18 +368,6 @@ int wxFileDialog::ShowModal()
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }

-        //=== Simulating the wxOVERWRITE_PROMPT >>============================
-        //should we also test for file save style ??
-        if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
-             ::wxFileExists( fileNameBuffer ) )
-             {
-             wxString messageText;
-             messageText.Printf(_("File '%s' already exists.\nDo you want to replace it?"), fileNameBuffer);
-             if ( wxMessageBox(messageText, _("Save File As"), wxYES_NO | wxICON_EXCLAMATION    ) != wxYES )
-             {
-                 success = FALSE;
-             }            
-        }

     }
     else
     {
     }
     else
     {