X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5ea105e0ba20c15e4d83f829e1c4faeb0a4952f0..98af9c738332c9a24475ad19efbfabe2b152c429:/src/msw/filedlg.cpp?ds=sidebyside diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp index 1aeb326354..2bf5d527c3 100644 --- a/src/msw/filedlg.cpp +++ b/src/msw/filedlg.cpp @@ -1,17 +1,21 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: filedlg.cpp +// Name: src/msw/filedlg.cpp // Purpose: wxFileDialog // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "filedlg.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,370 +24,499 @@ #pragma hdrstop #endif +#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) + #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/filefn.h" #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" #endif -#include - -#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__) - #include -#endif +#include "wx/msw/wrapcdlg.h" -#include "wx/msw/private.h" - -#include #include #include -#if !USE_SHARED_LIBRARY - IMPLEMENT_CLASS(wxFileDialog, wxDialog) +#include "wx/filename.h" +#include "wx/tokenzr.h" +#include "wx/math.h" + +#include "wx/msw/missing.h" + +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +#ifdef __WIN32__ +# define wxMAXPATH 65534 +#else +# define wxMAXPATH 1024 #endif -wxString wxFileSelector(const char *title, - const char *defaultDir, - const char *defaultFileName, - const char *defaultExtension, - const char *filter, - int flags, - wxWindow *parent, - int x, int y) +# define wxMAXFILE 1024 + +# define wxMAXEXT 5 + +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- + +// standard dialog size +static wxRect gs_rectDialog(0, 0, 428, 266); + +// ============================================================================ +// implementation +// ============================================================================ + +IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase) + +// ---------------------------------------------------------------------------- +// hook function for moving the dialog +// ---------------------------------------------------------------------------- + +UINT_PTR APIENTRY +wxFileDialogHookFunction(HWND hDlg, + UINT iMsg, + WPARAM WXUNUSED(wParam), + LPARAM lParam) { - // 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("*.") + 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( Strlen(defaultExtension) != 0 ) + HWND hwndDialog; + hwndDialog = ::GetParent( hDlg ); + switch (iMsg) { - int filterFind = 1, - filterIndex = 0; - - for( unsigned int i = 0; i < filter2.Len(); i++ ) - { - if( filter2.GetChar(i) == '|' ) + case WM_DESTROY: { - // save the start index of the new filter - unsigned int is = i++; - filterIndex++; - - // find the end of the filter - for( ; i < filter2.Len(); i++ ) - { - if(filter2[i] == '|') - break; - } + RECT dlgRect; + GetWindowRect( hwndDialog, & dlgRect ); + gs_rectDialog.x = dlgRect.left; + gs_rectDialog.y = dlgRect.top; + gs_rectDialog.width = dlgRect.right - dlgRect.left; + gs_rectDialog.height = dlgRect.bottom - dlgRect.top; + } + break; - if( i-is-1 > 0 && is+1 < filter2.Len() ) + case WM_NOTIFY: + { + OFNOTIFY * pNotifyCode; + pNotifyCode = (LPOFNOTIFY) lParam; + if (CDN_INITDONE == (pNotifyCode->hdr).code) { - if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) ) -// if( filter2.Mid(is+1,i-is-1) == defaultExtension ) - { - filterFind = filterIndex; - break; - } - } + SetWindowPos( hwndDialog, HWND_TOP, + gs_rectDialog.x, + gs_rectDialog.y, + gs_rectDialog.width, + gs_rectDialog.height, + SWP_NOZORDER|SWP_NOSIZE); + } } - } - - fileDialog.SetFilterIndex(filterFind); + break; } - if ( fileDialog.ShowModal() == wxID_OK ) - { - strcpy(wxBuffer, (const char *)fileDialog.GetPath()); - return wxBuffer; - } - else - return wxGetEmptyString(); + // do the default processing + return 0; } -# if __BORLANDC__ -# include // for MAXPATH etc. ( Borland 3.1 ) -# endif - -# ifndef MAXPATH -# define MAXPATH 400 -# endif +// ---------------------------------------------------------------------------- +// wxFileDialog +// ---------------------------------------------------------------------------- -# ifndef MAXDRIVE -# define MAXDRIVE 3 -# endif +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) -# ifndef MAXFILE -# define MAXFILE 9 -# endif - -# ifndef MAXEXT -# define MAXEXT 5 -# endif +{ + if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) ) + m_dialogStyle &= ~wxMULTIPLE; + m_bMovedWindow = false; -wxString wxFileSelectorEx(const char *title, - const char *defaultDir, - const char *defaultFileName, - int* defaultFilterIndex, - const char *filter, - int flags, - wxWindow* parent, - int x, - int y) + // 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; +} +void wxFileDialog::GetPaths(wxArrayString& paths) const { - wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "", - defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y)); + paths.Empty(); + + wxString dir(m_dir); + if ( m_dir.Last() != _T('\\') ) + dir += _T('\\'); - if ( fileDialog.ShowModal() == wxID_OK ) + size_t count = m_fileNames.GetCount(); + for ( size_t n = 0; n < count; n++ ) { - *defaultFilterIndex = fileDialog.GetFilterIndex(); - strcpy(wxBuffer, (const char *)fileDialog.GetPath()); - return wxBuffer; + if (wxFileName(m_fileNames[n]).IsAbsolute()) + paths.Add(m_fileNames[n]); + else + paths.Add(dir + m_fileNames[n]); } - else - return wxGetEmptyString(); } -wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message, - const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard, - long style, const wxPoint& pos) +void wxFileDialog::GetFilenames(wxArrayString& files) const { - m_message = message; - m_dialogStyle = style; - m_parent = parent; - m_path = ""; - m_fileName = defaultFileName; - m_dir = defaultDir; - m_wildCard = wildCard; - m_filterIndex = 1; + files = m_fileNames; } -int wxFileDialog::ShowModal(void) +void wxFileDialog::SetPath(const wxString& path) +{ + wxString ext; + wxSplitPath(path, &m_dir, &m_fileName, &ext); + if ( !ext.empty() ) + m_fileName << _T('.') << ext; +} + +void wxFileDialog::DoGetPosition( int *x, int *y ) const +{ + *x = gs_rectDialog.x; + *y = gs_rectDialog.y; +} + + +void wxFileDialog::DoGetSize(int *width, int *height) const +{ + *width = gs_rectDialog.width; + *height = gs_rectDialog.height; +} + +void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(width), int WXUNUSED(height)) +{ + m_bMovedWindow = true; + + gs_rectDialog.x = x; + gs_rectDialog.y = y; + + /* + The width and height can not be set by the programmer + its just not possible. But the program can get the + size of the Dlg after it has been shown, in case they need + that data. + */ +} + +int wxFileDialog::ShowModal() { HWND hWnd = 0; if (m_parent) hWnd = (HWND) m_parent->GetHWND(); + if (!hWnd && wxTheApp->GetTopWindow()) + hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND(); - static char fileNameBuffer [ MAXPATH ]; // the file-name - char titleBuffer [ MAXFILE+1+MAXEXT ]; // the file-name, without path + static wxChar fileNameBuffer [ wxMAXPATH ]; // the file-name + wxChar titleBuffer [ wxMAXFILE+1+wxMAXEXT ]; // the file-name, without path - *fileNameBuffer = '\0'; - *titleBuffer = '\0'; + *fileNameBuffer = wxT('\0'); + *titleBuffer = wxT('\0'); +#if WXWIN_COMPATIBILITY_2_4 long msw_flags = 0; if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) msw_flags |= OFN_HIDEREADONLY; +#else + long msw_flags = OFN_HIDEREADONLY; +#endif + if ( m_dialogStyle & wxFILE_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.. One additional note, when the hook is + enabled, the PLACES BAR in the dlg (shown on later versions + of windows (2000 and XP) will automatically be turned off + according to the MSDN docs. This is normal. If the + programmer needs the PLACES BAR (left side of dlg) they + just shouldn't move or center the dlg. + */ + if (m_bMovedWindow) // we need these flags. + { + msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK; +#ifndef __WXWINCE__ + msw_flags |= OFN_ENABLESIZING; +#endif + } - OPENFILENAME of; - memset(&of, 0, sizeof(OPENFILENAME)); + if (m_dialogStyle & wxMULTIPLE ) + { + // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT + msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT; + } - of.lpstrCustomFilter = NULL; // system should not save custom filter - of.nMaxCustFilter = 0L; + // if wxCHANGE_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 ( !(m_dialogStyle & wxCHANGE_DIR) ) + { + msw_flags |= OFN_NOCHANGEDIR; + } - of.nFileOffset = 0; // 0-based pointer to filname in lpstFile - of.nFileExtension = 0; // 0-based pointer to extension in lpstrFile - of.lpstrDefExt = NULL; // no default extension + if ( m_dialogStyle & wxOVERWRITE_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); - of.hwndOwner = hWnd; - of.lpstrTitle = (char *)(const char *)m_message; - +#endif + of.hwndOwner = hWnd; + of.lpstrTitle = WXSTRINGCAST m_message; of.lpstrFileTitle = titleBuffer; - of.nMaxFileTitle = MAXFILE + 1 + MAXEXT; // Windows 3.0 and 3.1 + 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] == '/') - m_dir[i] = '\\'; + // forward slashes) and also squeeze multiple consecutive slashes into one + // as it doesn't like two backslashes in a row neither - of.lpstrInitialDir = (const char *) m_dir; + 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('\\'); - of.Flags = msw_flags; + // fall through + case _T('\\'): + while ( i < len - 1 ) + { + wxChar chNext = m_dir[i + 1]; + if ( chNext != _T('\\') && chNext != _T('/') ) + break; - //=== 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. + // ignore the next one, unless it is at the start of a UNC path + if (i > 0) + i++; + else + break; + } + // fall through - eg. "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2" + default: + // normal char + dir += ch; + } + } - If you put a single wild card, it works as before the modification. - */ - //======================================================================= + of.lpstrInitialDir = dir.c_str(); - wxString theFilter; - if ( Strlen(m_wildCard) == 0 ) - theFilter = wxString("*.*"); - else - theFilter = m_wildCard ; - wxString filterBuffer; + of.Flags = msw_flags; + of.lpfnHook = wxFileDialogHookFunction; - if ( !strchr( theFilter, '|' ) ) { // only one filter ==> default text - filterBuffer.Printf(_("Files (%s)|%s"), - theFilter.c_str(), theFilter.c_str()); - } - else { // more then one filter - filterBuffer = theFilter; + wxArrayString wildDescriptions, wildFilters; + + size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters); + + wxASSERT_MSG( items > 0 , _T("empty wildcard list") ); + + wxString filterBuffer; + for (i = 0; i < items ; i++) + { + filterBuffer += wildDescriptions[i]; + filterBuffer += wxT("|"); + filterBuffer += wildFilters[i]; + filterBuffer += wxT("|"); } - filterBuffer += "|"; // Replace | with \0 for (i = 0; i < filterBuffer.Len(); i++ ) { - if ( filterBuffer.GetChar(i) == '|' ) { - filterBuffer[i] = '\0'; + if ( filterBuffer.GetChar(i) == wxT('|') ) { + filterBuffer[i] = wxT('\0'); } } - of.lpstrFilter = (LPSTR)(const char *)filterBuffer; - of.nFilterIndex = m_filterIndex; + of.lpstrFilter = (LPTSTR)filterBuffer.c_str(); + of.nFilterIndex = m_filterIndex + 1; //=== Setting defaultFileName >>========================================= - strncpy( fileNameBuffer, (const char *)m_fileName, MAXPATH-1 ); - fileNameBuffer[ MAXPATH-1 ] = '\0'; + wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 ); + fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0'); of.lpstrFile = fileNameBuffer; // holds returned filename - of.nMaxFile = MAXPATH; - - //== Execute FileDialog >>================================================= - - bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) - : (GetOpenFileName(&of) != 0); - - if ( success ) + of.nMaxFile = wxMAXPATH; + + // we must set the default extension because otherwise Windows would check + // for the existing of a wrong file with wxOVERWRITE_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 (m_dialogStyle & wxSAVE) { - const char* extension = NULL; + const wxChar* extension = filterBuffer; + int maxFilter = (int)(of.nFilterIndex*2L) - 1; - //=== Adding the correct extension >>================================= + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - m_filterIndex = (int)of.nFilterIndex; - - if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != '.' ) - { // user has typed an filename - // without an extension: + // use dummy name a to avoid assert in AppendExtension + defextBuffer = AppendExtension(wxT("a"), extension); + if (defextBuffer.StartsWith(wxT("a."))) + { + defextBuffer.Mid(2); + of.lpstrDefExt = defextBuffer.c_str(); + } + } - int maxFilter = (int)(of.nFilterIndex*2L-1L); - extension = filterBuffer; + // store off before the standard windows dialog can possibly change it + const wxString cwdOrig = wxGetCwd(); - for( int i = 0; i < maxFilter; i++ ) { // get extension - extension = extension + strlen( extension ) +1; - } + //== Execute FileDialog >>================================================= - extension = strrchr( extension, '.' ); - if ( extension // != "blabla" - && !strrchr( extension, '*' ) // != "blabla.*" - && !strrchr( extension, '?' ) // != "blabla.?" - && extension[1] // != "blabla." - && extension[1] != ' ' ) // != "blabla. " - { - // now concat extension to the fileName: - m_fileName = wxString(fileNameBuffer) + extension; + bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of) + : GetOpenFileName(&of)) != 0; - int len = strlen( fileNameBuffer ); - strncpy( fileNameBuffer + len, extension, MAXPATH - len ); - fileNameBuffer[ MAXPATH -1 ] = '\0'; - } - } + DWORD errCode = CommDlgExtendedError(); - m_path = fileNameBuffer; - m_fileName = wxFileNameFromPath(fileNameBuffer); + // 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 wxCHANGE_DIR + // let's restore the current working directory to what it was before the + // dialog was shown (assuming this behavior extends to Windows Server 2003 + // seems safe). + if ( success && + (msw_flags & OFN_NOCHANGEDIR) && + wxGetOsVersion() == wxWINDOWS_NT ) + { + wxSetWorkingDirectory(cwdOrig); + } +#ifdef __WIN32__ + if (!success && (errCode == CDERR_STRUCTSIZE)) + { + // The struct size has changed so try a smaller or bigger size - //=== Simulating the wxOVERWRITE_PROMPT >>============================ + int oldStructSize = of.lStructSize; + of.lStructSize = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD)); + success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) + : (GetOpenFileName(&of) != 0); + errCode = CommDlgExtendedError(); - if ( (m_dialogStyle & wxOVERWRITE_PROMPT) && - ::wxFileExists( fileNameBuffer ) ) + if (!success && (errCode == CDERR_STRUCTSIZE)) { - wxString messageText; - messageText.Printf(_("Replace file '%s'?"), fileNameBuffer); + of.lStructSize = oldStructSize + (sizeof(void *) + 2*sizeof(DWORD)); + success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) + : (GetOpenFileName(&of) != 0); + } + } +#endif // __WIN32__ - if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES ) + if ( success ) + { + 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')) { - success = FALSE; + m_fileNames.Add(&fileNameBuffer[i]); + i += wxStrlen(&fileNameBuffer[i]) + 1; } +#else + wxStringTokenizer toke(fileNameBuffer, _T(" \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_path = dir + m_fileName; + m_filterIndex = (int)of.nFilterIndex - 1; } + else + { + //=== Adding the correct extension >>================================= - } // END: if ( success ) - - return (success ? wxID_OK : wxID_CANCEL) ; + m_filterIndex = (int)of.nFilterIndex - 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; -// Generic file load/save dialog (for internal use only) -static -wxString wxDefaultFileSelector(bool load, - const char *what, - const char *extension, - const char *default_name, - wxWindow *parent) -{ - wxString prompt; - wxString str = load ? _("Load %s file") : _("Save %s file"); - prompt.Printf(str, what); + for( int i = 0; i < maxFilter; i++ ) // get extension + extension = extension + wxStrlen( extension ) + 1; - const char *ext = extension; - if (*ext == '.') - ext++; + 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'); + } - wxString wild; - wild.Printf("*.%s", ext); + m_path = fileNameBuffer; + m_fileName = wxFileNameFromPath(fileNameBuffer); + m_fileNames.Add(m_fileName); + m_dir = wxPathOnly(fileNameBuffer); + } + } + 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 wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent); -} + return success ? wxID_OK : wxID_CANCEL; -// Generic file load dialog -WXDLLEXPORT wxString wxLoadFileSelector(const char *what, - const char *extension, - const char *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(TRUE, what, extension, default_name, parent); } -// Generic file save dialog -WXDLLEXPORT wxString wxSaveFileSelector(const char *what, - const char *extension, - const char *default_name, - wxWindow *parent) -{ - return wxDefaultFileSelector(FALSE, what, extension, default_name, parent); -} +#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)