X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..18d2e17080a0bea4b85e0ad7223cfc6bcdab0e1e:/src/msw/filedlg.cpp?ds=sidebyside diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index f2b7231c4d..b3f2a2999b 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -15,36 +15,34 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/msw/private.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP - #include - #include "wx/defs.h" #include "wx/utils.h" #include "wx/msgdlg.h" #include "wx/dialog.h" #include "wx/filedlg.h" #include "wx/intl.h" -#endif + #include "wx/log.h" -#include +// #include "wx/msw/private.h" +#endif #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) #include #endif -#include "wx/msw/private.h" - #include #include #include -#if !USE_SHARED_LIBRARY - IMPLEMENT_CLASS(wxFileDialog, wxDialog) -#endif +#include "wx/tokenzr.h" + +IMPLEMENT_CLASS(wxFileDialog, wxDialog) wxString wxFileSelector(const wxChar *title, const wxChar *defaultDir, @@ -69,7 +67,7 @@ wxString wxFileSelector(const wxChar *title, wxString filter2; if ( defaultExtension && !filter ) - filter2 = wxString(_T("*.")) + defaultExtension; + filter2 = wxString(wxT("*.")) + defaultExtension; else if ( filter ) filter2 = filter; @@ -91,7 +89,7 @@ wxString wxFileSelector(const wxChar *title, for( unsigned int i = 0; i < filter2.Len(); i++ ) { - if( filter2.GetChar(i) == _T('|') ) + if( filter2.GetChar(i) == wxT('|') ) { // save the start index of the new filter unsigned int is = i++; @@ -100,7 +98,7 @@ wxString wxFileSelector(const wxChar *title, // find the end of the filter for( ; i < filter2.Len(); i++ ) { - if(filter2[i] == _T('|')) + if(filter2[i] == wxT('|')) break; } @@ -160,8 +158,8 @@ wxString wxFileSelectorEx(const wxChar *title, int y) { - wxFileDialog fileDialog(parent, title ? title : _T(""), defaultDir ? defaultDir : _T(""), - defaultFileName ? defaultFileName : _T(""), filter ? filter : _T(""), flags, wxPoint(x, y)); + wxFileDialog fileDialog(parent, title ? title : wxT(""), defaultDir ? defaultDir : wxT(""), + defaultFileName ? defaultFileName : wxT(""), filter ? filter : wxT(""), flags, wxPoint(x, y)); if ( fileDialog.ShowModal() == wxID_OK ) { @@ -179,15 +177,32 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, { m_message = message; m_dialogStyle = style; + if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) + m_dialogStyle &= ~wxMULTIPLE; m_parent = parent; - m_path = _T(""); + m_path = wxT(""); m_fileName = defaultFileName; m_dir = defaultDir; m_wildCard = wildCard; - m_filterIndex = 1; + m_filterIndex = 0; } -int wxFileDialog::ShowModal(void) +void wxFileDialog::GetPaths(wxArrayString& paths) const +{ + paths.Empty(); + + wxString dir(m_dir); + if ( m_dir.Last() != _T('\\') ) + dir += _T('\\'); + + size_t count = m_fileNames.GetCount(); + for ( size_t n = 0; n < count; n++ ) + { + paths.Add(dir + m_fileNames[n]); + } +} + +int wxFileDialog::ShowModal() { HWND hWnd = 0; if (m_parent) hWnd = (HWND) m_parent->GetHWND(); @@ -195,14 +210,20 @@ int wxFileDialog::ShowModal(void) static wxChar fileNameBuffer [ MAXPATH ]; // the file-name wxChar titleBuffer [ MAXFILE+1+MAXEXT ]; // the file-name, without path - *fileNameBuffer = _T('\0'); - *titleBuffer = _T('\0'); + *fileNameBuffer = wxT('\0'); + *titleBuffer = wxT('\0'); long msw_flags = 0; if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) msw_flags |= OFN_HIDEREADONLY; if ( m_dialogStyle & wxFILE_MUST_EXIST ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + if (m_dialogStyle & wxMULTIPLE ) + msw_flags |= +#if defined(OFN_EXPLORER) + OFN_EXPLORER | +#endif // OFN_EXPLORER + OFN_ALLOWMULTISELECT; OPENFILENAME of; memset(&of, 0, sizeof(OPENFILENAME)); @@ -227,8 +248,8 @@ int wxFileDialog::ShowModal(void) size_t i = 0; size_t len = m_dir.Length(); for (i = 0; i < len; i++) - if (m_dir[i] == _T('/')) - m_dir[i] = _T('\\'); + if (m_dir[i] == wxT('/')) + m_dir[i] = wxT('\\'); of.lpstrInitialDir = m_dir.c_str(); @@ -250,12 +271,12 @@ int wxFileDialog::ShowModal(void) wxString theFilter; if ( wxStrlen(m_wildCard) == 0 ) - theFilter = wxString(_T("*.*")); + theFilter = wxString(wxT("*.*")); else theFilter = m_wildCard ; wxString filterBuffer; - if ( !wxStrchr( theFilter, _T('|') ) ) { // only one filter ==> default text + if ( !wxStrchr( theFilter, wxT('|') ) ) { // only one filter ==> default text filterBuffer.Printf(_("Files (%s)|%s"), theFilter.c_str(), theFilter.c_str()); } @@ -264,21 +285,21 @@ int wxFileDialog::ShowModal(void) } - filterBuffer += _T("|"); + filterBuffer += wxT("|"); // Replace | with \0 for (i = 0; i < filterBuffer.Len(); i++ ) { - if ( filterBuffer.GetChar(i) == _T('|') ) { - filterBuffer[i] = _T('\0'); + if ( filterBuffer.GetChar(i) == wxT('|') ) { + filterBuffer[i] = wxT('\0'); } } of.lpstrFilter = (LPTSTR)(const wxChar *)filterBuffer; - of.nFilterIndex = m_filterIndex; + of.nFilterIndex = m_filterIndex + 1; //=== Setting defaultFileName >>========================================= wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, MAXPATH-1 ); - fileNameBuffer[ MAXPATH-1 ] = _T('\0'); + fileNameBuffer[ MAXPATH-1 ] = wxT('\0'); of.lpstrFile = fileNameBuffer; // holds returned filename of.nMaxFile = MAXPATH; @@ -290,41 +311,84 @@ int wxFileDialog::ShowModal(void) if ( success ) { - const wxChar* extension = NULL; + m_fileNames.Empty(); + + if ( ( m_dialogStyle & wxMULTIPLE ) && +#if defined(OFN_EXPLORER) + ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) ) +#else + ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) ) +#endif // OFN_EXPLORER + { +#if defined(OFN_EXPLORER) + m_dir = fileNameBuffer; + i = of.nFileOffset; + m_fileName = &fileNameBuffer[i]; + m_fileNames.Add(m_fileName); + i += m_fileName.Len() + 1; + + while (fileNameBuffer[i] != wxT('\0')) + { + m_fileNames.Add(&fileNameBuffer[i]); + i += wxStrlen(&fileNameBuffer[i]) + 1; + } +#else + wxStringTokenizer toke(fileNameBuffer, " \t\r\n"); + m_dir = toke.GetNextToken(); + m_fileName = toke.GetNextToken(); + m_fileNames.Add(m_fileName); + + while (toke.HasMoreTokens()) + m_fileNames.Add(toke.GetNextToken()); +#endif // OFN_EXPLORER + + wxString dir(m_dir); + if ( m_dir.Last() != _T('\\') ) + dir += _T('\\'); + + m_fileNames.Sort(); + m_path = dir + m_fileName; + } + else + { + const wxChar* extension = NULL; - //=== Adding the correct extension >>================================= + //=== Adding the correct extension >>================================= - m_filterIndex = (int)of.nFilterIndex; + m_filterIndex = (int)of.nFilterIndex - 1; - if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != _T('.') ) - { // user has typed an filename - // without an extension: + if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) ) + { // user has typed an filename + // without an extension: - int maxFilter = (int)(of.nFilterIndex*2L-1L); - extension = filterBuffer; + int maxFilter = (int)(of.nFilterIndex*2L-1L); + extension = filterBuffer; - for( int i = 0; i < maxFilter; i++ ) { // get extension - extension = extension + wxStrlen( extension ) +1; - } + for( int i = 0; i < maxFilter; i++ ) { // get extension + extension = extension + wxStrlen( extension ) +1; + } - extension = wxStrrchr( extension, _T('.') ); - if ( extension // != "blabla" - && !wxStrrchr( extension, _T('*') ) // != "blabla.*" - && !wxStrrchr( extension, _T('?') ) // != "blabla.?" - && extension[1] // != "blabla." - && extension[1] != _T(' ') ) // != "blabla. " - { - // now concat extension to the fileName: - m_fileName = wxString(fileNameBuffer) + extension; + extension = wxStrrchr( extension, wxT('.') ); + if ( extension // != "blabla" + && !wxStrrchr( extension, wxT('*') ) // != "blabla.*" + && !wxStrrchr( extension, wxT('?') ) // != "blabla.?" + && extension[1] // != "blabla." + && extension[1] != wxT(' ') ) // != "blabla. " + { + // now concat extension to the fileName: + m_fileName = wxString(fileNameBuffer) + extension; - int len = wxStrlen( fileNameBuffer ); - wxStrncpy( fileNameBuffer + len, extension, MAXPATH - len ); - fileNameBuffer[ MAXPATH -1 ] = _T('\0'); + int len = wxStrlen( fileNameBuffer ); + wxStrncpy( fileNameBuffer + len, extension, MAXPATH - len ); + fileNameBuffer[ MAXPATH -1 ] = wxT('\0'); + } } - } - m_path = fileNameBuffer; - m_fileName = wxFileNameFromPath(fileNameBuffer); + m_path = fileNameBuffer; + m_fileName = wxFileNameFromPath(fileNameBuffer); + m_fileNames.Add(m_fileName); + m_dir = wxPathOnly(fileNameBuffer); + } //=== Simulating the wxOVERWRITE_PROMPT >>============================ @@ -341,9 +405,23 @@ int wxFileDialog::ShowModal(void) } } - } // END: if ( success ) + } + else + { + // common dialog failed - why? +#ifdef __WXDEBUG__ + DWORD dwErr = CommDlgExtendedError(); + if ( dwErr != 0 ) + { + // this msg is only for developers + wxLogError(wxT("Common dialog failed with error code %0lx."), + dwErr); + } + //else: it was just cancelled +#endif + } - return (success ? wxID_OK : wxID_CANCEL) ; + return success ? wxID_OK : wxID_CANCEL; } @@ -362,11 +440,11 @@ wxString wxDefaultFileSelector(bool load, prompt.Printf(str, what); const wxChar *ext = extension; - if (*ext == _T('.')) + if (*ext == wxT('.')) ext++; wxString wild; - wild.Printf(_T("*.%s"), ext); + wild.Printf(wxT("*.%s"), ext); return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent); } @@ -389,3 +467,4 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what, return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); } +