X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ca6a5f04692678cd2d9f3ea0843fc3f5a0b254f..eae4425db65fd3399aecdc70a8a05cc4f82d1eec:/src/msw/filedlg.cpp?ds=sidebyside diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index cf25db47e6..8677731279 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filedlg.h" #endif @@ -28,11 +28,13 @@ #pragma hdrstop #endif +#if wxUSE_FILEDLG && !wxUSE_SMARTPHONE + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/msgdlg.h" - #include "wx/dialog.h" #include "wx/filedlg.h" + #include "wx/filefn.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/app.h" @@ -40,7 +42,7 @@ #include "wx/msw/private.h" -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) +#if !defined(__WIN32__) || defined(__WXWINCE__) #include #endif @@ -48,14 +50,19 @@ #include #include +#include "wx/filename.h" #include "wx/tokenzr.h" +#ifndef OFN_EXPLORER + #define OFN_EXPLORER 0x00080000 +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- #ifdef __WIN32__ -# define wxMAXPATH 4096 +# define wxMAXPATH 65534 #else # define wxMAXPATH 1024 #endif @@ -68,143 +75,24 @@ // implementation // ============================================================================ -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_CLASS(wxFileDialog, wxDialog) +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) // ---------------------------------------------------------------------------- -// global functions +// wxFileDialog // ---------------------------------------------------------------------------- -wxString wxFileSelector(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - const wxChar *defaultExtension, - const wxChar *filter, - int flags, - wxWindow *parent, - int x, int y) -{ - // In the original implementation, defaultExtension is passed to the - // lpstrDefExt member of OPENFILENAME. This extension, if non-NULL, is - // appended to the filename if the user fails to type an extension. The new - // implementation (taken from wxFileSelectorEx) appends the extension - // automatically, by looking at the filter specification. In fact this - // should be better than the native Microsoft implementation because - // Windows only allows *one* default extension, whereas here we do the - // right thing depending on the filter the user has chosen. - - // If there's a default extension specified but no filter, we create a - // suitable filter. - - wxString filter2; - if ( defaultExtension && !filter ) - filter2 = wxString(wxT("*.")) + defaultExtension; - else if ( filter ) - filter2 = filter; - - wxString defaultDirString; - if (defaultDir) - defaultDirString = defaultDir; - - wxString defaultFilenameString; - if (defaultFileName) - defaultFilenameString = defaultFileName; - - wxFileDialog fileDialog(parent, title, defaultDirString, - defaultFilenameString, filter2, - flags, wxPoint(x, y)); - if( wxStrlen(defaultExtension) != 0 ) - { - int filterFind = 1, - filterIndex = 0; - - for( unsigned int i = 0; i < filter2.Len(); i++ ) - { - if( filter2.GetChar(i) == wxT('|') ) - { - // save the start index of the new filter - unsigned int is = i++; - filterIndex++; +wxFileDialog::wxFileDialog(wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFileName, + const wxString& wildCard, + long style, + const wxPoint& pos) + :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos) - // find the end of the filter - for( ; i < filter2.Len(); i++ ) - { - if(filter2[i] == wxT('|')) - break; - } - - if( i-is-1 > 0 && is+1 < filter2.Len() ) - { - if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) ) -// if( filter2.Mid(is+1,i-is-1) == defaultExtension ) - { - filterFind = filterIndex; - break; - } - } - } - } - - fileDialog.SetFilterIndex(filterFind); - } - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - filename = fileDialog.GetPath(); - } - - return filename; -} - - -wxString wxFileSelectorEx(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - int* defaultFilterIndex, - const wxChar *filter, - int flags, - wxWindow* parent, - int x, - int y) - -{ - wxFileDialog fileDialog(parent, - title ? title : wxT(""), - defaultDir ? defaultDir : wxT(""), - defaultFileName ? defaultFileName : wxT(""), - filter ? filter : wxT(""), - flags, wxPoint(x, y)); - - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) - { - if ( defaultFilterIndex ) - *defaultFilterIndex = fileDialog.GetFilterIndex(); - - filename = fileDialog.GetPath(); - } - - return filename; -} - -wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos) { - m_message = message; - m_dialogStyle = style; if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) m_dialogStyle &= ~wxMULTIPLE; - m_parent = parent; - m_path = wxT(""); - m_fileName = defaultFileName; - m_dir = defaultDir; - m_wildCard = wildCard; - m_filterIndex = 0; } void wxFileDialog::GetPaths(wxArrayString& paths) const @@ -218,10 +106,26 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const size_t count = m_fileNames.GetCount(); for ( size_t n = 0; n < count; n++ ) { - paths.Add(dir + m_fileNames[n]); + if (wxFileName(m_fileNames[n]).IsAbsolute()) + paths.Add(m_fileNames[n]); + else + paths.Add(dir + m_fileNames[n]); } } +void wxFileDialog::GetFilenames(wxArrayString& files) const +{ + files = m_fileNames; +} + +void wxFileDialog::SetPath(const wxString& path) +{ + wxString ext; + wxSplitPath(path, &m_dir, &m_fileName, &ext); + if ( !ext.empty() ) + m_fileName << _T('.') << ext; +} + int wxFileDialog::ShowModal() { HWND hWnd = 0; @@ -240,12 +144,24 @@ int wxFileDialog::ShowModal() 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; + { + // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT + msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT; + } + + // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the + // standard dialog does by default + if ( !(m_dialogStyle & wxCHANGE_DIR) ) + { + msw_flags |= OFN_NOCHANGEDIR; + } + + if ( m_dialogStyle & wxOVERWRITE_PROMPT ) + { + msw_flags |= OFN_OVERWRITEPROMPT; + } OPENFILENAME of; wxZeroMemory(of); @@ -267,14 +183,45 @@ int wxFileDialog::ShowModal() of.nMaxFileTitle = wxMAXFILE + 1 + wxMAXEXT; // Windows 3.0 and 3.1 // Convert forward slashes to backslashes (file selector doesn't like - // forward slashes) - size_t i = 0; - size_t len = m_dir.Length(); - for (i = 0; i < len; i++) - if (m_dir[i] == wxT('/')) - m_dir[i] = wxT('\\'); + // forward slashes) and also squeeze multiple consecutive slashes into one + // as it doesn't like two backslashes in a row neither + + wxString dir; + size_t i, len = m_dir.length(); + dir.reserve(len); + for ( i = 0; i < len; i++ ) + { + wxChar ch = m_dir[i]; + switch ( ch ) + { + case _T('/'): + // convert to backslash + ch = _T('\\'); + + // fall through + + case _T('\\'): + while ( i < len - 1 ) + { + wxChar chNext = m_dir[i + 1]; + if ( chNext != _T('\\') && chNext != _T('/') ) + break; + + // ignore the next one, unless it is at the start of a UNC path + if (i > 0) + i++; + else + break; + } + // fall through + + default: + // normal char + dir += ch; + } + } - of.lpstrInitialDir = m_dir.c_str(); + of.lpstrInitialDir = dir.c_str(); of.Flags = msw_flags; @@ -329,8 +276,8 @@ int wxFileDialog::ShowModal() //== Execute FileDialog >>================================================= - bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) - : (GetOpenFileName(&of) != 0); + bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of) + : GetOpenFileName(&of)) != 0; DWORD errCode = CommDlgExtendedError(); @@ -352,7 +299,7 @@ int wxFileDialog::ShowModal() : (GetOpenFileName(&of) != 0); } } -#endif +#endif // __WIN32__ if ( success ) { @@ -360,10 +307,11 @@ int wxFileDialog::ShowModal() if ( ( m_dialogStyle & wxMULTIPLE ) && #if defined(OFN_EXPLORER) - ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) ) + ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) #else - ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) ) + ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) #endif // OFN_EXPLORER + ) { #if defined(OFN_EXPLORER) m_dir = fileNameBuffer; @@ -378,7 +326,7 @@ int wxFileDialog::ShowModal() i += wxStrlen(&fileNameBuffer[i]) + 1; } #else - wxStringTokenizer toke(fileNameBuffer, " \t\r\n"); + wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n")); m_dir = toke.GetNextToken(); m_fileName = toke.GetNextToken(); m_fileNames.Add(m_fileName); @@ -391,42 +339,27 @@ int wxFileDialog::ShowModal() if ( m_dir.Last() != _T('\\') ) dir += _T('\\'); - m_fileNames.Sort(); m_path = dir + m_fileName; } else { - const wxChar* extension = NULL; - //=== Adding the correct extension >>================================= m_filterIndex = (int)of.nFilterIndex - 1; - 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; - - for( int i = 0; i < maxFilter; i++ ) { // get extension - extension = extension + wxStrlen( extension ) +1; - } + if ( !of.nFileExtension || + (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) + { + // User has typed a filename without an extension: + const wxChar* extension = filterBuffer; + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - 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; + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - int len = wxStrlen( fileNameBuffer ); - wxStrncpy( fileNameBuffer + len, extension, wxMAXPATH - len ); - fileNameBuffer[ wxMAXPATH -1 ] = wxT('\0'); - } + m_fileName = AppendExtension(fileNameBuffer, extension); + wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.Len(), wxMAXPATH-1)); + fileNameBuffer[wxMin(m_fileName.Len(), wxMAXPATH-1)] = wxT('\0'); } m_path = fileNameBuffer; @@ -434,22 +367,6 @@ int wxFileDialog::ShowModal() m_fileNames.Add(m_fileName); m_dir = wxPathOnly(fileNameBuffer); } - - - //=== Simulating the wxOVERWRITE_PROMPT >>============================ - - if ( (m_dialogStyle & wxOVERWRITE_PROMPT) && - ::wxFileExists( fileNameBuffer ) ) - { - wxString messageText; - messageText.Printf(_("Replace file '%s'?"), fileNameBuffer); - - if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES ) - { - success = FALSE; - } - } - } else { @@ -470,46 +387,5 @@ int wxFileDialog::ShowModal() } -// Generic file load/save dialog (for internal use only) -static -wxString wxDefaultFileSelector(bool load, - const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - wxString prompt; - wxString str; - if (load) str = _("Load %s file"); - else str = _("Save %s file"); - prompt.Printf(str, what); - - const wxChar *ext = extension; - if (*ext == wxT('.')) - ext++; - - wxString wild; - wild.Printf(wxT("*.%s"), ext); - - return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent); -} - -// Generic file load dialog -WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(TRUE, what, extension, default_name, parent); -} - -// Generic file save dialog -WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what, - const wxChar *extension, - const wxChar *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); -} - +#endif // wxUSE_FILEDLG