X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/012a01fc1ea0f4c870eaf66bb332617affa5abd0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/filedlg.cpp diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index ac7478a9d8..7ed1c81362 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,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "filedlg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,40 +24,34 @@ #pragma hdrstop #endif -#if wxUSE_FILEDLG +#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) + +#include "wx/filedlg.h" #ifndef WX_PRECOMP + #include "wx/msw/wrapcdlg.h" + #include "wx/msw/missing.h" #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" + #include "wx/math.h" #endif -#include "wx/msw/private.h" - -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) - #include -#endif - -#include #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 @@ -70,164 +60,254 @@ # define wxMAXEXT 5 +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +// standard dialog size for the old Windows systems where the dialog wasn't +// resizeable +static wxRect gs_rectDialog(0, 0, 428, 266); + // ============================================================================ // implementation // ============================================================================ +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) + // ---------------------------------------------------------------------------- -// wxWin macros +// hook function for moving the dialog // ---------------------------------------------------------------------------- -IMPLEMENT_CLASS(wxFileDialog, wxDialog) +UINT_PTR APIENTRY +wxFileDialogHookFunction(HWND hDlg, + UINT iMsg, + WPARAM WXUNUSED(wParam), + LPARAM lParam) +{ + switch ( iMsg ) + { + case WM_NOTIFY: + { + OFNOTIFY *pNotifyCode = wx_reinterpret_cast(OFNOTIFY *, lParam); + if ( pNotifyCode->hdr.code == CDN_INITDONE ) + { + wx_reinterpret_cast(wxFileDialog *, + pNotifyCode->lpOFN->lCustData) + ->MSWOnInitDone((WXHWND)hDlg); + } + } + break; + + case WM_DESTROY: + // reuse the position used for the dialog the next time by default + // + // NB: at least under Windows 2003 this is useless as after the + // first time it's shown the dialog always remembers its size + // and position itself and ignores any later SetWindowPos calls + wxCopyRECTToRect(wxGetWindowRect(::GetParent(hDlg)), gs_rectDialog); + break; + } + + // do the default processing + return 0; +} // ---------------------------------------------------------------------------- -// 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) +wxFileDialog::wxFileDialog(wxWindow *parent, + const wxString& message, + const wxString& defaultDir, + const wxString& defaultFileName, + const wxString& wildCard, + long style, + const wxPoint& pos, + const wxSize& sz, + const wxString& name) + : wxFileDialogBase(parent, message, defaultDir, defaultFileName, + wildCard, style, pos, sz, name) + { - // 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 = 0, - filterIndex = 0; + // NB: all style checks are done by wxFileDialogBase::Create - 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++; + m_bMovedWindow = false; + m_centreDir = 0; - // 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) ) - { - filterFind = filterIndex; - break; - } - } + // Must set to zero, otherwise the wx routines won't size the window + // the second time you call the file dialog, because it thinks it is + // already at the requested size.. (when centering) + gs_rectDialog.x = + gs_rectDialog.y = 0; +} - filterIndex++; - } - } +void wxFileDialog::GetPaths(wxArrayString& paths) const +{ + paths.Empty(); - fileDialog.SetFilterIndex(filterFind); - } + wxString dir(m_dir); + if ( m_dir.Last() != _T('\\') ) + dir += _T('\\'); - wxString filename; - if ( fileDialog.ShowModal() == wxID_OK ) + size_t count = m_fileNames.GetCount(); + for ( size_t n = 0; n < count; n++ ) { - filename = fileDialog.GetPath(); + if (wxFileName(m_fileNames[n]).IsAbsolute()) + paths.Add(m_fileNames[n]); + else + paths.Add(dir + m_fileNames[n]); } +} - return filename; +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; +} -wxString wxFileSelectorEx(const wxChar *title, - const wxChar *defaultDir, - const wxChar *defaultFileName, - int* defaultFilterIndex, - const wxChar *filter, - int flags, - wxWindow* parent, - int x, - int y) +void wxFileDialog::DoGetPosition(int *x, int *y) const +{ + if ( x ) + *x = gs_rectDialog.x; + if ( y ) + *y = gs_rectDialog.y; +} +void wxFileDialog::DoGetSize(int *width, int *height) const { - 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(); + if ( width ) + *width = gs_rectDialog.width; + if ( height ) + *height = gs_rectDialog.height; +} - filename = fileDialog.GetPath(); +void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h)) +{ + gs_rectDialog.x = x; + gs_rectDialog.y = y; + + // our HWND is only set when we're called from MSWOnInitDone(), test if + // this is the case + HWND hwnd = GetHwnd(); + if ( hwnd ) + { + // size of the dialog can't be changed because the controls are not + // laid out correctly then + ::SetWindowPos(hwnd, HWND_TOP, x, y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); } + else // just remember that we were requested to move the window + { + m_bMovedWindow = true; - return filename; + // if Centre() had been called before, it shouldn't be taken into + // account now + m_centreDir = 0; + } } -wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& WXUNUSED(pos)) +void wxFileDialog::DoCentre(int dir) { - 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; + m_centreDir = dir; + m_bMovedWindow = true; + + // it's unnecessary to do anything else at this stage as we'll redo it in + // MSWOnInitDone() anyhow } -void wxFileDialog::GetPaths(wxArrayString& paths) const +void wxFileDialog::MSWOnInitDone(WXHWND hDlg) { - paths.Empty(); + // note the the dialog is the parent window: hDlg is a child of it when + // OFN_EXPLORER is used + HWND hFileDlg = ::GetParent((HWND)hDlg); - wxString dir(m_dir); - if ( m_dir.Last() != _T('\\') ) - dir += _T('\\'); + // set HWND so that our DoMoveWindow() works correctly + SetHWND((WXHWND)hFileDlg); - size_t count = m_fileNames.GetCount(); - for ( size_t n = 0; n < count; n++ ) + if ( m_centreDir ) + { + // now we have the real dialog size, remember it + RECT rect; + GetWindowRect(hFileDlg, &rect); + gs_rectDialog = wxRectFromRECT(rect); + + // and position the window correctly: notice that we must use the base + // class version as our own doesn't do anything except setting flags + wxFileDialogBase::DoCentre(m_centreDir); + } + else // need to just move it to the correct place + { + SetPosition(gs_rectDialog.GetPosition()); + } + + // we shouldn't destroy this HWND + SetHWND(NULL); +} + +// helper used below in ShowModal(): style is used to determine whether to show +// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one; +// returns true on success or false on failure in which case err is filled with +// the CDERR_XXX constant +static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err) +{ + if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) ) + return true; + + if ( err ) { - paths.Add(dir + m_fileNames[n]); +#ifdef __WXWINCE__ + // according to MSDN, CommDlgExtendedError() should work under CE as + // well but apparently in practice it doesn't (anybody has more + // details?) + *err = GetLastError(); +#else + *err = CommDlgExtendedError(); +#endif } + + return false; } +// We want to use OPENFILENAME struct version 5 (Windows 2000/XP) but we don't +// know if the OPENFILENAME declared in the currently used headers is a V5 or +// V4 (smaller) one so we try to manually extend the struct in case it is the +// old one. +// +// We don't do this on Windows CE nor under Win64, however, as there are no +// compilers with old headers for these architectures +#if defined(__WXWINCE__) || defined(__WIN64__) + typedef OPENFILENAME wxOPENFILENAME; + + static const DWORD gs_ofStructSize = sizeof(OPENFILENAME); +#else // !__WXWINCE__ || __WIN64__ + #define wxTRY_SMALLER_OPENFILENAME + + struct wxOPENFILENAME : public OPENFILENAME + { + // fields added in Windows 2000/XP comdlg32.dll version + void *pVoid; + DWORD dw1; + DWORD dw2; + }; + + // hardcoded sizeof(OPENFILENAME) in the Platform SDK: we have to do it + // because sizeof(OPENFILENAME) in the headers we use when compiling the + // library could be less if _WIN32_WINNT is not >= 0x500 + static const DWORD wxOPENFILENAME_V5_SIZE = 88; + + // this is hardcoded sizeof(OPENFILENAME_NT4) from Platform SDK + static const DWORD wxOPENFILENAME_V4_SIZE = 76; + + // always try the new one first + static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE; +#endif // __WXWINCE__ || __WIN64__/!... + int wxFileDialog::ShowModal() { HWND hWnd = 0; @@ -241,56 +321,60 @@ int wxFileDialog::ShowModal() *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 ) + long msw_flags = OFN_HIDEREADONLY; + + if ( HasFdFlag(wxFD_FILE_MUST_EXIST) ) msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + /* + If the window has been moved the programmer is probably + trying to center or position it. Thus we set the callback + or hook function so that we can actually adjust the position. + Without moving or centering the dlg, it will just stay + in the upper left of the frame, it does not center + automatically. + */ + if (m_bMovedWindow) // we need these flags. + { + msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK; +#ifndef __WXWINCE__ + msw_flags |= OFN_ENABLESIZING; +#endif + } - if (m_dialogStyle & wxMULTIPLE ) + if ( HasFdFlag(wxFD_MULTIPLE) ) { // 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) ) + // if wxFD_CHANGE_DIR flag is not given we shouldn't change the CWD which the + // standard dialog does by default (notice that under NT it does it anyhow, + // OFN_NOCHANGEDIR or not, see below) + if ( !HasFdFlag(wxFD_CHANGE_DIR) ) { 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 ) + + if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) ) { msw_flags |= OFN_OVERWRITEPROMPT; } -*/ - OPENFILENAME of; - wxZeroMemory(of); - // the OPENFILENAME struct has been extended in newer version of - // comcdlg32.dll, but as we don't use the extended fields anyhow, set - // the struct size to the old value - otherwise, the programs compiled - // with new headers will not work with the old libraries -#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0500) - of.lStructSize = sizeof(OPENFILENAME) - - (sizeof(void *) + 2*sizeof(DWORD)); -#else // old headers - of.lStructSize = sizeof(OPENFILENAME); -#endif + wxOPENFILENAME of; + wxZeroMemory(of); + of.lStructSize = gs_ofStructSize; of.hwndOwner = hWnd; - of.lpstrTitle = WXSTRINGCAST m_message; + of.lpstrTitle = m_message.wx_str(); of.lpstrFileTitle = titleBuffer; - of.nMaxFileTitle = wxMAXFILE + 1 + wxMAXEXT; // Windows 3.0 and 3.1 + of.nMaxFileTitle = wxMAXFILE + 1 + wxMAXEXT; // Convert forward slashes to backslashes (file selector doesn't like // 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(); + wxString dir; + size_t i, len = m_dir.length(); dir.reserve(len); for ( i = 0; i < len; i++ ) { @@ -310,8 +394,11 @@ int wxFileDialog::ShowModal() if ( chNext != _T('\\') && chNext != _T('/') ) break; - // ignore the next one - i++; + // ignore the next one, unless it is at the start of a UNC path + if (i > 0) + i++; + else + break; } // fall through @@ -324,100 +411,119 @@ int wxFileDialog::ShowModal() of.lpstrInitialDir = dir.c_str(); of.Flags = msw_flags; + of.lpfnHook = wxFileDialogHookFunction; + of.lCustData = (LPARAM)this; + wxArrayString wildDescriptions, wildFilters; - //=== Like Alejandro Sierra's wildcard modification >>=================== - /* - In wxFileSelector you can put, instead of a single wild_card, - pairs of strings separated by '|'. - The first string is a description, and the - second is the wild card. You can put any number of pairs. - - eg. "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2" + size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters); - If you put a single wild card, it works as before the modification. - */ - //======================================================================= + wxASSERT_MSG( items > 0 , _T("empty wildcard list") ); - wxString theFilter; - if ( wxStrlen(m_wildCard) == 0 ) - theFilter = wxString(wxT("*.*")); - else - theFilter = m_wildCard ; wxString filterBuffer; - if ( !wxStrchr( theFilter, wxT('|') ) ) { // only one filter ==> default text - filterBuffer.Printf(_("Files (%s)|%s"), - theFilter.c_str(), theFilter.c_str()); - } - else { // more then one filter - filterBuffer = theFilter; - + for (i = 0; i < items ; i++) + { + filterBuffer += wildDescriptions[i]; + filterBuffer += wxT("|"); + filterBuffer += wildFilters[i]; + filterBuffer += wxT("|"); } - filterBuffer += wxT("|"); // Replace | with \0 - for (i = 0; i < filterBuffer.Len(); i++ ) { + for (i = 0; i < filterBuffer.length(); i++ ) { if ( filterBuffer.GetChar(i) == wxT('|') ) { filterBuffer[i] = wxT('\0'); } } - of.lpstrFilter = (LPTSTR)(const wxChar *)filterBuffer; + of.lpstrFilter = (LPTSTR)filterBuffer.wx_str(); of.nFilterIndex = m_filterIndex + 1; //=== Setting defaultFileName >>========================================= - wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 ); + wxStrncpy(fileNameBuffer, m_fileName, wxMAXPATH-1); fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0'); of.lpstrFile = fileNameBuffer; // holds returned filename of.nMaxFile = wxMAXPATH; - //== Execute FileDialog >>================================================= + // we must set the default extension because otherwise Windows would check + // for the existing of a wrong file with wxFD_OVERWRITE_PROMPT (i.e. if the + // user types "foo" and the default extension is ".bar" we should force it + // to check for "foo.bar" existence and not "foo") + wxString defextBuffer; // we need it to be alive until GetSaveFileName()! + if (HasFdFlag(wxFD_SAVE)) + { + const wxChar* extension = filterBuffer.wx_str(); + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of) - : GetOpenFileName(&of)) != 0; + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - DWORD errCode = CommDlgExtendedError(); + // use dummy name a to avoid assert in AppendExtension + defextBuffer = AppendExtension(wxT("a"), extension); + if (defextBuffer.StartsWith(wxT("a."))) + { + defextBuffer = defextBuffer.Mid(2); // remove "a." + of.lpstrDefExt = defextBuffer.c_str(); + } + } -#ifdef __WIN32__ - if (!success && (errCode == CDERR_STRUCTSIZE)) + // store off before the standard windows dialog can possibly change it + const wxString cwdOrig = wxGetCwd(); + + //== Execute FileDialog >>================================================= + + DWORD errCode; + bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode); + +#ifdef wxTRY_SMALLER_OPENFILENAME + // the system might be too old to support the new version file dialog + // boxes, try with the old size + if ( !success && errCode == CDERR_STRUCTSIZE && + of.lStructSize != wxOPENFILENAME_V4_SIZE ) { - // The struct size has changed so try a smaller or bigger size + of.lStructSize = wxOPENFILENAME_V4_SIZE; - int oldStructSize = of.lStructSize; - of.lStructSize = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD)); - success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) - : (GetOpenFileName(&of) != 0); - errCode = CommDlgExtendedError(); + success = DoShowCommFileDialog(&of, m_windowStyle, &errCode); - if (!success && (errCode == CDERR_STRUCTSIZE)) + if ( success || !errCode ) { - of.lStructSize = oldStructSize + (sizeof(void *) + 2*sizeof(DWORD)); - success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) - : (GetOpenFileName(&of) != 0); + // use this struct size for subsequent dialogs + gs_ofStructSize = of.lStructSize; } } -#endif // __WIN32__ +#endif // wxTRY_SMALLER_OPENFILENAME if ( success ) { + // GetOpenFileName will always change the current working directory on + // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag + // OFN_NOCHANGEDIR has no effect. If the user did not specify + // wxFD_CHANGE_DIR let's restore the current working directory to what it + // was before the dialog was shown. + if ( msw_flags & OFN_NOCHANGEDIR ) + { + wxSetWorkingDirectory(cwdOrig); + } + m_fileNames.Empty(); - if ( ( m_dialogStyle & wxMULTIPLE ) && + if ( ( HasFdFlag(wxFD_MULTIPLE) ) && #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; i = of.nFileOffset; m_fileName = &fileNameBuffer[i]; m_fileNames.Add(m_fileName); - i += m_fileName.Len() + 1; + i += m_fileName.length() + 1; while (fileNameBuffer[i] != wxT('\0')) { @@ -438,54 +544,28 @@ int wxFileDialog::ShowModal() if ( m_dir.Last() != _T('\\') ) dir += _T('\\'); - m_fileNames.Sort(); m_path = dir + m_fileName; + m_filterIndex = (int)of.nFilterIndex - 1; } else { - const wxChar* extension = NULL; - //=== Adding the correct extension >>================================= m_filterIndex = (int)of.nFilterIndex - 1; - if ( !of.nFileExtension || + if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) ) { // User has typed a filename without an extension: + const wxChar* extension = filterBuffer.wx_str(); + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - // A filename can end in a "." here ("abc."), this means it - // does not have an extension. Because later on a "." with - // the default extension is appended we remove the "." if - // filename ends with one (We don't want files called - // "abc..ext") - int idx = wxStrlen(fileNameBuffer) - 1; - if ( fileNameBuffer[idx] == wxT('.') ) - { - fileNameBuffer[idx] = wxT('\0'); - } - - 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, 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, wxMAXPATH - len ); - fileNameBuffer[ wxMAXPATH -1 ] = wxT('\0'); - } + m_fileName = AppendExtension(fileNameBuffer, extension); + wxStrncpy(fileNameBuffer, m_fileName.c_str(), wxMin(m_fileName.length(), wxMAXPATH-1)); + fileNameBuffer[wxMin(m_fileName.length(), wxMAXPATH-1)] = wxT('\0'); } m_path = fileNameBuffer; @@ -493,82 +573,23 @@ 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; - } - } } +#ifdef __WXDEBUG__ else { // common dialog failed - why? -#ifdef __WXDEBUG__ - DWORD dwErr = CommDlgExtendedError(); - if ( dwErr != 0 ) + if ( errCode != 0 ) { - // this msg is only for developers + // this msg is only for developers so don't translate it wxLogError(wxT("Common dialog failed with error code %0lx."), - dwErr); + errCode); } //else: it was just cancelled -#endif } +#endif // __WXDEBUG__ return success ? wxID_OK : wxID_CANCEL; } -// 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, - load ? wxOPEN : wxSAVE, 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 - +#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)