#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/wrapcdlg.h"
-
#include <stdlib.h>
#include <string.h>
+#include "wx/dynlib.h"
#include "wx/filename.h"
+#include "wx/scopeguard.h"
#include "wx/tokenzr.h"
-#include "wx/math.h"
-
-#include "wx/msw/missing.h"
+#include "wx/testing.h"
// ----------------------------------------------------------------------------
// constants
// globals
// ----------------------------------------------------------------------------
-// standard dialog size
+// standard dialog size for the old Windows systems where the dialog wasn't
+// resizable
static wxRect gs_rectDialog(0, 0, 428, 266);
// ============================================================================
IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+#if wxUSE_DYNLIB_CLASS
+
+typedef BOOL (WINAPI *GetProcessUserModeExceptionPolicy_t)(LPDWORD);
+typedef BOOL (WINAPI *SetProcessUserModeExceptionPolicy_t)(DWORD);
+
+GetProcessUserModeExceptionPolicy_t gs_pfnGetProcessUserModeExceptionPolicy
+ = (GetProcessUserModeExceptionPolicy_t) -1;
+
+SetProcessUserModeExceptionPolicy_t gs_pfnSetProcessUserModeExceptionPolicy
+ = (SetProcessUserModeExceptionPolicy_t) -1;
+
+DWORD gs_oldExceptionPolicyFlags = 0;
+
+bool gs_changedPolicy = false;
+
+#endif // #if wxUSE_DYNLIB_CLASS
+
+/*
+Since Windows 7 by default (callback) exceptions aren't swallowed anymore
+with native x64 applications. Exceptions can occur in a file dialog when
+using the hook procedure in combination with third-party utilities.
+Since Windows 7 SP1 the swallowing of exceptions can be enabled again
+by using SetProcessUserModeExceptionPolicy.
+*/
+void ChangeExceptionPolicy()
+{
+#if wxUSE_DYNLIB_CLASS
+ gs_changedPolicy = false;
+
+ wxLoadedDLL dllKernel32(wxT("kernel32.dll"));
+
+ if ( gs_pfnGetProcessUserModeExceptionPolicy
+ == (GetProcessUserModeExceptionPolicy_t) -1)
+ {
+ wxDL_INIT_FUNC(gs_pfn, GetProcessUserModeExceptionPolicy, dllKernel32);
+ wxDL_INIT_FUNC(gs_pfn, SetProcessUserModeExceptionPolicy, dllKernel32);
+ }
+
+ if ( !gs_pfnGetProcessUserModeExceptionPolicy
+ || !gs_pfnSetProcessUserModeExceptionPolicy
+ || !gs_pfnGetProcessUserModeExceptionPolicy(&gs_oldExceptionPolicyFlags) )
+ {
+ return;
+ }
+
+ if ( gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags
+ | 0x1 /* PROCESS_CALLBACK_FILTER_ENABLED */ ) )
+ {
+ gs_changedPolicy = true;
+ }
+
+#endif // wxUSE_DYNLIB_CLASS
+}
+
+void RestoreExceptionPolicy()
+{
+#if wxUSE_DYNLIB_CLASS
+ if (gs_changedPolicy)
+ {
+ gs_changedPolicy = false;
+ (void) gs_pfnSetProcessUserModeExceptionPolicy(gs_oldExceptionPolicyFlags);
+ }
+#endif // wxUSE_DYNLIB_CLASS
+}
+
+} // unnamed namespace
+
// ----------------------------------------------------------------------------
// hook function for moving the dialog
// ----------------------------------------------------------------------------
{
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 = wx_reinterpret_cast(OFNOTIFY *, lParam);
+ OFNOTIFY *pNotifyCode = reinterpret_cast<OFNOTIFY *>(lParam);
if ( pNotifyCode->hdr.code == CDN_INITDONE )
{
- // note that we need to move the parent window: hDlg is a
- // child of it when OFN_EXPLORER is used
- ::SetWindowPos
- (
- ::GetParent(hDlg),
- HWND_TOP,
- gs_rectDialog.x, gs_rectDialog.y,
- 0, 0,
- SWP_NOZORDER | SWP_NOSIZE
- );
+ reinterpret_cast<wxFileDialog *>(
+ pNotifyCode->lpOFN->lCustData)
+ ->MSWOnInitDone((WXHWND)hDlg);
}
}
break;
wildCard, style, pos, sz, name)
{
- if ( ( m_windowStyle & wxMULTIPLE ) && ( m_windowStyle & wxSAVE ) )
- m_windowStyle &= ~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.empty() || 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)
-{
- wxString ext;
- wxSplitPath(path, &m_dir, &m_fileName, &ext);
- if ( !ext.empty() )
- m_fileName << _T('.') << ext;
-}
-
void wxFileDialog::DoGetPosition(int *x, int *y) const
{
if ( x )
*y = gs_rectDialog.y;
}
-
void wxFileDialog::DoGetSize(int *width, int *height) const
{
if ( width )
void wxFileDialog::DoMoveWindow(int x, int y, int WXUNUSED(w), int WXUNUSED(h))
{
- m_bMovedWindow = true;
-
gs_rectDialog.x = x;
gs_rectDialog.y = y;
- // size of the dialog can't be changed because the controls are not laid
- // out correctly then
+ // 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 ShowModal(): style is used to determine whether to show
-// the "Save file" dialog (if it contains wxSAVE bit) or "Open file" one;
-// returns true on success or false on failure in which case err is filled with
-// the CDERR_XXX constant
+// 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 & wxSAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
+ if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
return true;
if ( err )
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)
+{
+ SetHWND(hwnd);
+
+ CreateExtraControl();
+
+ SetHWND(NULL);
+}
+#endif // __WXWINCE__
+
int wxFileDialog::ShowModal()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
HWND hWnd = 0;
if (m_parent) hWnd = (HWND) m_parent->GetHWND();
if (!hWnd && wxTheApp->GetTopWindow())
*fileNameBuffer = wxT('\0');
*titleBuffer = wxT('\0');
-#if WXWIN_COMPATIBILITY_2_4
- long msw_flags = 0;
- if ( (m_windowStyle & wxHIDE_READONLY) || (m_windowStyle & wxSAVE) )
- msw_flags |= OFN_HIDEREADONLY;
-#else
long msw_flags = OFN_HIDEREADONLY;
-#endif
- if ( m_windowStyle & wxFILE_MUST_EXIST )
+ if ( HasFdFlag(wxFD_FILE_MUST_EXIST) )
msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
/*
If the window has been moved the programmer is probably
in the upper left of the frame, it does not center
automatically.
*/
- if (m_bMovedWindow) // we need these flags.
+ if (m_bMovedWindow || HasExtraControlCreator()) // we need these flags.
{
+ ChangeExceptionPolicy();
msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
#ifndef __WXWINCE__
msw_flags |= OFN_ENABLESIZING;
#endif
}
- if (m_windowStyle & wxMULTIPLE )
+ wxON_BLOCK_EXIT0(RestoreExceptionPolicy);
+
+ 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
+ // 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 ( !(m_windowStyle & wxCHANGE_DIR) )
+ if ( !HasFdFlag(wxFD_CHANGE_DIR) )
{
msw_flags |= OFN_NOCHANGEDIR;
}
- if ( m_windowStyle & wxOVERWRITE_PROMPT )
+ if ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )
{
msw_flags |= OFN_OVERWRITEPROMPT;
}
of.lStructSize = gs_ofStructSize;
of.hwndOwner = hWnd;
- of.lpstrTitle = WXSTRINGCAST m_message;
+ of.lpstrTitle = m_message.t_str();
of.lpstrFileTitle = titleBuffer;
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
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
of.Flags = msw_flags;
of.lpfnHook = wxFileDialogHookFunction;
+ of.lCustData = (LPARAM)this;
wxArrayString wildDescriptions, wildFilters;
size_t items = wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters);
- wxASSERT_MSG( items > 0 , _T("empty wildcard list") );
+ wxASSERT_MSG( items > 0 , wxT("empty wildcard list") );
wxString filterBuffer;
}
// 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)filterBuffer.c_str();
+ of.lpstrFilter = filterBuffer.t_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;
// 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
+ // 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 (m_windowStyle & wxSAVE)
+ if (HasFdFlag(wxFD_SAVE))
{
- const wxChar* extension = filterBuffer;
+ const wxChar* extension = filterBuffer.t_str();
int maxFilter = (int)(of.nFilterIndex*2L) - 1;
for( int i = 0; i < maxFilter; i++ ) // get extension
defextBuffer = AppendExtension(wxT("a"), extension);
if (defextBuffer.StartsWith(wxT("a.")))
{
- defextBuffer.Mid(2);
+ defextBuffer = defextBuffer.Mid(2); // remove "a."
of.lpstrDefExt = defextBuffer.c_str();
}
}
//== Execute FileDialog >>=================================================
- DWORD errCode;
- bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
+ if ( !ShowCommFileDialog(&of, m_windowStyle) )
+ return wxID_CANCEL;
-#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 )
+ // 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 )
{
- of.lStructSize = wxOPENFILENAME_V4_SIZE;
-
- success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
-
- if ( success || !errCode )
- {
- // use this struct size for subsequent dialogs
- gs_ofStructSize = of.lStructSize;
- }
+ wxSetWorkingDirectory(cwdOrig);
}
-#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
- // wxCHANGE_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();
- m_fileNames.Empty();
-
- if ( ( m_windowStyle & 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('\\');
+ wxString dir(m_dir);
+ if ( m_dir.Last() != wxT('\\') )
+ dir += wxT('\\');
- m_path = dir + m_fileName;
- m_filterIndex = (int)of.nFilterIndex - 1;
- }
- else
- {
- //=== Adding the correct extension >>=================================
-
- 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.t_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));
}
- }
-#ifdef __WXDEBUG__
- else
- {
- // common dialog failed - why?
- if ( errCode != 0 )
- {
- // this msg is only for developers so don't translate it
- wxLogError(wxT("Common dialog failed with error code %0lx."),
- errCode);
+
+ m_path = fileNameBuffer;
+ m_fileName = wxFileNameFromPath(fileNameBuffer);
+ m_fileNames.Add(m_fileName);
+ m_dir = wxPathOnly(fileNameBuffer);
}
- //else: it was just cancelled
- }
-#endif // __WXDEBUG__
- return success ? wxID_OK : wxID_CANCEL;
+ return wxID_OK;
}
#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)
-
projects / wxWidgets.git / blobdiff