X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..439ddeba9dcb2bb020ba70da81dab76746dc0081:/src/msw/filedlg.cpp diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 52ea324076..b8d7c947e5 100644 --- 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; @@ -152,13 +157,12 @@ int wxFileDialog::ShowModal() { 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; } -*/ + OPENFILENAME of; wxZeroMemory(of); @@ -336,6 +340,7 @@ int wxFileDialog::ShowModal() dir += _T('\\'); m_path = dir + m_fileName; + m_filterIndex = (int)of.nFilterIndex - 1; } else { @@ -363,18 +368,6 @@ int wxFileDialog::ShowModal() 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, wxT("Save File As"), wxYES_NO | wxICON_EXCLAMATION ) != wxYES ) - { - success = FALSE; - } - } } else {