// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "filedlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
+#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/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(__WXWINCE__)
- #include <commdlg.h>
-#endif
-
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include "wx/filename.h"
#include "wx/tokenzr.h"
-#ifndef OFN_EXPLORER
- #define OFN_EXPLORER 0x00080000
-#endif
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
# define wxMAXEXT 5
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// standard dialog size for the old Windows systems where the dialog wasn't
+// resizable
+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)
+{
+ switch ( iMsg )
+ {
+#ifndef __WXWINCE__
+ case WM_INITDIALOG:
+ {
+ OPENFILENAME* ofn = reinterpret_cast<OPENFILENAME *>(lParam);
+ reinterpret_cast<wxFileDialog *>(ofn->lCustData)
+ ->MSWOnInitDialogHook((WXHWND)hDlg);
+ }
+ break;
+#endif // __WXWINCE__
+
+ case WM_NOTIFY:
+ {
+ OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
+ if ( pNotifyCode->hdr.code == CDN_INITDONE )
+ {
+ 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;
+}
+
// ----------------------------------------------------------------------------
// wxFileDialog
// ----------------------------------------------------------------------------
const wxString& defaultFileName,
const wxString& wildCard,
long style,
- const wxPoint& pos)
- :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+ const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name)
+ : wxFileDialogBase(parent, message, defaultDir, defaultFileName,
+ wildCard, style, pos, sz, name)
{
- if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
- m_dialogStyle &= ~wxMULTIPLE;
+ // NB: all style checks are done by wxFileDialogBase::Create
+
+ m_bMovedWindow = false;
+ m_centreDir = 0;
+
+ // 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
paths.Empty();
wxString dir(m_dir);
- if ( m_dir.Last() != _T('\\') )
- dir += _T('\\');
+ if ( m_dir.Last() != wxT('\\') )
+ dir += wxT('\\');
size_t count = m_fileNames.GetCount();
for ( size_t n = 0; n < count; n++ )
files = m_fileNames;
}
-void wxFileDialog::SetPath(const wxString& path)
+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
+{
+ if ( width )
+ *width = gs_rectDialog.width;
+ if ( height )
+ *height = gs_rectDialog.height;
+}
+
+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;
+
+ // if Centre() had been called before, it shouldn't be taken into
+ // account now
+ m_centreDir = 0;
+ }
+}
+
+void wxFileDialog::DoCentre(int dir)
+{
+ 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::MSWOnInitDone(WXHWND hDlg)
+{
+ // note the dialog is the parent window: hDlg is a child of it when
+ // OFN_EXPLORER is used
+ HWND hFileDlg = ::GetParent((HWND)hDlg);
+
+ // set HWND so that our DoMoveWindow() works correctly
+ SetHWND((WXHWND)hFileDlg);
+
+ 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 ShowCommFileDialog(): 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 )
+ {
+#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__/!...
+
+static bool ShowCommFileDialog(OPENFILENAME *of, long style)
+{
+ DWORD errCode;
+ bool success = DoShowCommFileDialog(of, style, &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 )
+ {
+ of->lStructSize = wxOPENFILENAME_V4_SIZE;
+
+ success = DoShowCommFileDialog(of, style, &errCode);
+
+ if ( success || !errCode )
+ {
+ // use this struct size for subsequent dialogs
+ gs_ofStructSize = of->lStructSize;
+ }
+ }
+#endif // wxTRY_SMALLER_OPENFILENAME
+
+ if ( !success &&
+ // FNERR_INVALIDFILENAME is not defined under CE (besides we don't
+ // use CommDlgExtendedError() there anyhow)
+#ifndef __WXWINCE__
+ errCode == FNERR_INVALIDFILENAME &&
+#endif // !__WXWINCE__
+ of->lpstrFile[0] )
+ {
+ // this can happen if the default file name is invalid, try without it
+ // now
+ of->lpstrFile[0] = wxT('\0');
+ success = DoShowCommFileDialog(of, style, &errCode);
+ }
+
+ if ( !success )
+ {
+ // common dialog failed - why?
+ if ( errCode != 0 )
+ {
+ wxLogError(_("File dialog failed with error code %0lx."), errCode);
+ }
+ //else: it was just cancelled
+
+ return false;
+ }
+
+ return true;
+}
+
+#ifndef __WXWINCE__
+void wxFileDialog::MSWOnInitDialogHook(WXHWND hwnd)
{
- wxString ext;
- wxSplitPath(path, &m_dir, &m_fileName, &ext);
- if ( !ext.empty() )
- m_fileName << _T('.') << ext;
+ SetHWND(hwnd);
+
+ CreateExtraControl();
+
+ SetHWND(NULL);
}
+#endif // __WXWINCE__
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 || HasExtraControlCreator()) // 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;
}
- if ( m_dialogStyle & wxOVERWRITE_PROMPT )
+ if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )
{
msw_flags |= OFN_OVERWRITEPROMPT;
}
- OPENFILENAME of;
+ wxOPENFILENAME 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
-
+ 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;
+
+#ifndef __WXWINCE__
+ GlobalPtr hgbl;
+ if ( HasExtraControlCreator() )
+ {
+ msw_flags |= OFN_ENABLETEMPLATEHANDLE;
+
+ hgbl.Init(256, GMEM_ZEROINIT);
+ GlobalPtrLock hgblLock(hgbl);
+ LPDLGTEMPLATE lpdt = static_cast<LPDLGTEMPLATE>(hgblLock.Get());
+
+ // Define a dialog box.
+
+ lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS;
+ lpdt->cdit = 0; // Number of controls
+ lpdt->x = 0;
+ lpdt->y = 0;
+
+ // convert the size of the extra controls to the dialog units
+ const wxSize extraSize = GetExtraControlSize();
+ const LONG baseUnits = ::GetDialogBaseUnits();
+ lpdt->cx = ::MulDiv(extraSize.x, 4, LOWORD(baseUnits));
+ lpdt->cy = ::MulDiv(extraSize.y, 8, HIWORD(baseUnits));
+
+ // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
+ // class and title, all three set to zeros.
+
+ of.hInstance = (HINSTANCE)lpdt;
+ }
+#endif // __WXWINCE__
// 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++ )
{
wxChar ch = m_dir[i];
switch ( ch )
{
- case _T('/'):
+ case wxT('/'):
// convert to backslash
- ch = _T('\\');
+ ch = wxT('\\');
// fall through
- case _T('\\'):
+ case wxT('\\'):
while ( i < len - 1 )
{
wxChar chNext = m_dir[i + 1];
- if ( chNext != _T('\\') && chNext != _T('/') )
+ if ( chNext != wxT('\\') && chNext != wxT('/') )
break;
// ignore the next one, unless it is at the start of a UNC path
if (i > 0)
i++;
else
- break;
+ break;
}
// fall through
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.
+ size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
- eg. "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2"
+ wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );
- If you put a single wild card, it works as before the modification.
- */
- //=======================================================================
-
- 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 );
- fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');
+ wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));
of.lpstrFile = fileNameBuffer; // holds returned filename
of.nMaxFile = wxMAXPATH;
- //== Execute FileDialog >>=================================================
-
- bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
- : GetOpenFileName(&of)) != 0;
-
- DWORD errCode = CommDlgExtendedError();
-
-#ifdef __WIN32__
- if (!success && (errCode == CDERR_STRUCTSIZE))
+ // 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))
{
- // The struct size has changed so try a smaller or bigger size
+ const wxChar* extension = filterBuffer.wx_str();
+ int maxFilter = (int)(of.nFilterIndex*2L) - 1;
- int oldStructSize = of.lStructSize;
- of.lStructSize = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD));
- success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
- : (GetOpenFileName(&of) != 0);
- errCode = CommDlgExtendedError();
+ for( int i = 0; i < maxFilter; i++ ) // get extension
+ extension = extension + wxStrlen( extension ) + 1;
- if (!success && (errCode == CDERR_STRUCTSIZE))
+ // use dummy name a to avoid assert in AppendExtension
+ defextBuffer = AppendExtension(wxT("a"), extension);
+ if (defextBuffer.StartsWith(wxT("a.")))
{
- of.lStructSize = oldStructSize + (sizeof(void *) + 2*sizeof(DWORD));
- success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
- : (GetOpenFileName(&of) != 0);
+ defextBuffer = defextBuffer.Mid(2); // remove "a."
+ of.lpstrDefExt = defextBuffer.c_str();
}
}
-#endif // __WIN32__
- if ( success )
+ // store off before the standard windows dialog can possibly change it
+ const wxString cwdOrig = wxGetCwd();
+
+ //== Execute FileDialog >>=================================================
+
+ if ( !ShowCommFileDialog(&of, m_windowStyle) )
+ return wxID_CANCEL;
+
+ // 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 )
{
- m_fileNames.Empty();
+ 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;
+ m_dir = fileNameBuffer;
+ i = of.nFileOffset;
+ m_fileName = &fileNameBuffer[i];
+ m_fileNames.Add(m_fileName);
+ i += m_fileName.length() + 1;
- while (fileNameBuffer[i] != wxT('\0'))
- {
- m_fileNames.Add(&fileNameBuffer[i]);
- i += wxStrlen(&fileNameBuffer[i]) + 1;
- }
+ while (fileNameBuffer[i] != wxT('\0'))
+ {
+ 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);
+ wxStringTokenizer toke(fileNameBuffer, wxT(" \t\r\n"));
+ m_dir = toke.GetNextToken();
+ m_fileName = toke.GetNextToken();
+ m_fileNames.Add(m_fileName);
- while (toke.HasMoreTokens())
- m_fileNames.Add(toke.GetNextToken());
+ 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 >>=================================
+ wxString dir(m_dir);
+ if ( m_dir.Last() != wxT('\\') )
+ dir += wxT('\\');
- m_filterIndex = (int)of.nFilterIndex - 1;
+ m_path = dir + m_fileName;
+ m_filterIndex = (int)of.nFilterIndex - 1;
+ }
+ else
+ {
+ //=== Adding the correct extension >>=================================
- 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;
+ m_filterIndex = (int)of.nFilterIndex - 1;
- 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.wx_str();
+ int maxFilter = (int)(of.nFilterIndex*2L) - 1;
- 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');
- }
+ for( int i = 0; i < maxFilter; i++ ) // get extension
+ extension = extension + wxStrlen( extension ) + 1;
- m_path = fileNameBuffer;
- m_fileName = wxFileNameFromPath(fileNameBuffer);
- m_fileNames.Add(m_fileName);
- m_dir = wxPathOnly(fileNameBuffer);
+ m_fileName = AppendExtension(fileNameBuffer, extension);
+ wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(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);
+
+ m_path = fileNameBuffer;
+ m_fileName = wxFileNameFromPath(fileNameBuffer);
+ m_fileNames.Add(m_fileName);
+ m_dir = wxPathOnly(fileNameBuffer);
}
- //else: it was just cancelled
-#endif
- }
- return success ? wxID_OK : wxID_CANCEL;
+ return wxID_OK;
}
-#endif // wxUSE_FILEDLG
-
+#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)
projects / wxWidgets.git / blobdiff