Fixed filename in wxOSX-Cocoa's file dialog using extension of wrong file type.

[wxWidgets.git] / src / msw / filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 805374a8e92b0e2e7832d5ffb168ce438f8a4772..cf0bb81e98525978ea1b80223f11b5da3b199946 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "filedlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,26 +24,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+
+#include "wx/filedlg.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/msw/missing.h"

     #include "wx/utils.h"
     #include "wx/msgdlg.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/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

+    #include "wx/math.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
-
-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
-    #include <commdlg.h>
-#endif
-
-#include <math.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#include "wx/filename.h"

 #include "wx/tokenzr.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/tokenzr.h"
 
 // ----------------------------------------------------------------------------


@@ -55,7 +51,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__

-# define wxMAXPATH   4096
+# define wxMAXPATH   65534

 #else
 # define wxMAXPATH   1024
 #endif
 #else
 # define wxMAXPATH   1024
 #endif


@@ -64,163 +60,318 @@
 
 # define wxMAXEXT    5
 
 
 # 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
 // ============================================================================
 
 // ============================================================================
 // 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 )
+    {
+#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;
+}

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// 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;
-                }
+    // 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;
+}

 
 

-                if( i-is-1 > 0 && is+1 < filter2.Len() )
-                {
-                    if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
-                    {
-                        filterFind = filterIndex;
-                        break;
-                    }
-                }
+void wxFileDialog::GetPaths(wxArrayString& paths) const
+{
+    paths.Empty();

 
 

-                filterIndex++;
-            }
-        }
+    wxString dir(m_dir);
+    if ( m_dir.Last() != wxT('\\') )
+        dir += wxT('\\');

 
 

-        fileDialog.SetFilterIndex(filterFind);
+    size_t count = m_fileNames.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        if (wxFileName(m_fileNames[n]).IsAbsolute())
+            paths.Add(m_fileNames[n]);
+        else
+            paths.Add(dir + m_fileNames[n]);

     }
     }

+}

 
 

-    wxString filename;
-    if ( fileDialog.ShowModal() == wxID_OK )
+void wxFileDialog::GetFilenames(wxArrayString& files) const
+{
+    files = m_fileNames;
+}
+
+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 )

     {
     {

-        filename = fileDialog.GetPath();
+        // 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;
+    }

 }
 
 }
 

+void wxFileDialog::DoCentre(int dir)
+{
+    m_centreDir = dir;
+    m_bMovedWindow = true;

 
 

-wxString wxFileSelectorEx(const wxChar *title,
-                       const wxChar *defaultDir,
-                       const wxChar *defaultFileName,
-                       int* defaultFilterIndex,
-                       const wxChar *filter,
-                       int       flags,
-                       wxWindow* parent,
-                       int       x,
-                       int       y)
+    // it's unnecessary to do anything else at this stage as we'll redo it in
+    // MSWOnInitDone() anyhow
+}

 
 

+void wxFileDialog::MSWOnInitDone(WXHWND hDlg)

 {
 {

-    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();
+    // 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);

 
 

-        filename = fileDialog.GetPath();
+    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());

     }
 
     }
 

-    return filename;
+    // we shouldn't destroy this HWND
+    SetHWND(NULL);

 }
 
 }
 

-wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
-        const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
-        long style, const wxPoint& pos)
+// 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)

 {
 {

-    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;
+    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;

 }
 
 }
 

-void wxFileDialog::GetPaths(wxArrayString& paths) const
+// 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)

 {
 {

-    paths.Empty();
+    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;

 
 

-    wxString dir(m_dir);
-    if ( m_dir.Last() != _T('\\') )
-        dir += _T('\\');
+        success = DoShowCommFileDialog(of, style, &errCode);

 
 

-    size_t count = m_fileNames.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+        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] )

     {
     {

-        paths.Add(dir + m_fileNames[n]);
+        // 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()
 {
 
 int wxFileDialog::ShowModal()
 {


@@ -235,281 +386,269 @@ int wxFileDialog::ShowModal()
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 
     *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;
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

-    if (m_dialogStyle & wxMULTIPLE )
-        msw_flags |=
-#if defined(OFN_EXPLORER)
-        OFN_EXPLORER |
-#endif // OFN_EXPLORER
-        OFN_ALLOWMULTISELECT;
+    /*
+        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
+    }

 
 

-    OPENFILENAME of;
-    wxZeroMemory(of);
+    if ( HasFdFlag(wxFD_MULTIPLE) )
+    {
+        // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
+        msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
+    }

 
 

-    // 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
+    // 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 ( HasFdFlag(wxFD_OVERWRITE_PROMPT) )
+    {
+        msw_flags |= OFN_OVERWRITEPROMPT;
+    }
+
+    wxOPENFILENAME of;
+    wxZeroMemory(of);

 
 

+    of.lStructSize       = gs_ofStructSize;

     of.hwndOwner         = hWnd;
     of.hwndOwner         = hWnd;

-    of.lpstrTitle        = WXSTRINGCAST m_message;
+    of.lpstrTitle        = m_message.wx_str();

     of.lpstrFileTitle    = titleBuffer;
     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)
-    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('\\');
+#ifndef __WXWINCE__
+    GlobalPtr hgbl;
+    if ( HasExtraControlCreator() )
+    {
+        msw_flags |= OFN_ENABLETEMPLATEHANDLE;

 
 

-    of.lpstrInitialDir   = m_dir.c_str();
+        hgbl.Init(256, GMEM_ZEROINIT);
+        GlobalPtrLock hgblLock(hgbl);
+        LPDLGTEMPLATE lpdt = static_cast<LPDLGTEMPLATE>(hgblLock.Get());

 
 

-    of.Flags             = msw_flags;
+        // Define a dialog box.

 
 

+        lpdt->style = DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS;
+        lpdt->cdit = 0;         // Number of controls
+        lpdt->x = 0;
+        lpdt->y = 0;

 
 

-    //=== 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.
+        // 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));

 
 

-       eg.  "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2"
+        // after the DLGTEMPLATE there are 3 additional WORDs for dialog menu,
+        // class and title, all three set to zeros.

 
 

-       If you put a single wild card, it works as before the modification.
-     */
-    //=======================================================================
+        of.hInstance = (HINSTANCE)lpdt;
+    }
+#endif // __WXWINCE__

 
 

-    wxString theFilter;
-    if ( wxStrlen(m_wildCard) == 0 )
-        theFilter = wxString(wxT("*.*"));
-    else
-        theFilter = m_wildCard ;
-    wxString filterBuffer;
+    // 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();
+    dir.reserve(len);
+    for ( i = 0; i < len; i++ )
+    {
+        wxChar ch = m_dir[i];
+        switch ( ch )
+        {
+            case wxT('/'):
+                // convert to backslash
+                ch = wxT('\\');
+
+                // fall through

 
 

-    if ( !wxStrchr( theFilter, wxT('|') ) ) {    // only one filter ==> default text
-        filterBuffer.Printf(_("Files (%s)|%s"),
-                            theFilter.c_str(), theFilter.c_str());
+            case wxT('\\'):
+                while ( i < len - 1 )
+                {
+                    wxChar chNext = m_dir[i + 1];
+                    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;
+                }
+                // fall through
+
+            default:
+                // normal char
+                dir += ch;
+        }

     }
     }

-    else {                                // more then one filter
-        filterBuffer = theFilter;

 
 

+    of.lpstrInitialDir   = dir.c_str();
+
+    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 , wxT("empty wildcard list") );
+
+    wxString filterBuffer;
+
+    for (i = 0; i < items ; i++)
+    {
+        filterBuffer += wildDescriptions[i];
+        filterBuffer += wxT("|");
+        filterBuffer += wildFilters[i];
+        filterBuffer += wxT("|");

     }
 
     }
 

-    filterBuffer += wxT("|");

     // Replace | with \0
     // 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');
         }
     }
 
         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 >>=========================================
 
     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;
 
 
     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

 
 

-    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);
+    }

 
 

-        if ( ( m_dialogStyle & wxMULTIPLE ) &&
+    m_fileNames.Empty();
+
+    if ( ( HasFdFlag(wxFD_MULTIPLE) ) &&

 #if defined(OFN_EXPLORER)
 #if defined(OFN_EXPLORER)

-             ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) )
+         ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') )

 #else
 #else

-             ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) )
+         ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') )

 #endif // OFN_EXPLORER
 #endif // OFN_EXPLORER

-        {
+       )
+    {

 #if defined(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;
-            }
-#else
-            wxStringTokenizer toke(fileNameBuffer, " \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_fileNames.Sort();
-            m_path = dir + m_fileName;
-        }
-        else
+        while (fileNameBuffer[i] != wxT('\0'))

         {
         {

-            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;
-                }
-
-                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_path = fileNameBuffer;
-            m_fileName = wxFileNameFromPath(fileNameBuffer);
-            m_fileNames.Add(m_fileName);
-            m_dir = wxPathOnly(fileNameBuffer);
+            m_fileNames.Add(&fileNameBuffer[i]);
+            i += wxStrlen(&fileNameBuffer[i]) + 1;

         }
         }

+#else
+        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());
+#endif // OFN_EXPLORER

 
 

-        //=== 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;
-            }
-        }
+        wxString dir(m_dir);
+        if ( m_dir.Last() != wxT('\\') )
+            dir += wxT('\\');

 
 

+        m_path = dir + m_fileName;
+        m_filterIndex = (int)of.nFilterIndex - 1;

     }
     else
     {
     }
     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 success ? wxID_OK : wxID_CANCEL;
+        //=== Adding the correct extension >>=================================

 
 

-}
+        m_filterIndex = (int)of.nFilterIndex - 1;

 
 

-// 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);
+        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;

 
 

-  const wxChar *ext = extension;
-  if (*ext == wxT('.'))
-      ext++;
+            for( int i = 0; i < maxFilter; i++ )           // get extension
+                extension = extension + wxStrlen( extension ) + 1;

 
 

-  wxString wild;
-  wild.Printf(wxT("*.%s"), ext);
+            m_fileName = AppendExtension(fileNameBuffer, extension);
+            wxStrlcpy(fileNameBuffer, m_fileName.c_str(), WXSIZEOF(fileNameBuffer));
+        }

 
 

-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
-}
+        m_path = fileNameBuffer;
+        m_fileName = wxFileNameFromPath(fileNameBuffer);
+        m_fileNames.Add(m_fileName);
+        m_dir = wxPathOnly(fileNameBuffer);
+        }

 
 

-// 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);
-}
+    return wxID_OK;

 
 

-// 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 && !(__SMARTPHONE__ && __WXWINCE__)