do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index f2b7231c4db84e8095fef9ef9f328e43d0135bcc..b8d7c947e5045230502f715327514157b11a8195 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -1,15 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
+// Name:        src/msw/filedlg.cpp

 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "filedlg.h"
 #endif
 
     #pragma implementation "filedlg.h"
 #endif
 


@@ -20,183 +28,116 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG && !wxUSE_SMARTPHONE
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include <stdio.h>
-    #include "wx/defs.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/filedlg.h"

+    #include "wx/filefn.h"

     #include "wx/intl.h"
     #include "wx/intl.h"

+    #include "wx/log.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#include <windows.h>
+#include "wx/msw/private.h"

 
 

-#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
+#if !defined(__WIN32__) || defined(__WXWINCE__)

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 

-#include "wx/msw/private.h"
-

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

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-#endif
-
-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)
-{
-    // 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(_T("*.")) + 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 = 1,
-            filterIndex = 0;
-
-        for( unsigned int i = 0; i < filter2.Len(); i++ )
-        {
-            if( filter2.GetChar(i) == _T('|') )
-            {
-                // save the start index of the new filter
-                unsigned int is = i++;
-                filterIndex++;
+#include "wx/filename.h"
+#include "wx/tokenzr.h"

 
 

-                // find the end of the filter
-                for( ; i < filter2.Len(); i++ )
-                {
-                    if(filter2[i] == _T('|'))
-                        break;
-                }
-
-                if( i-is-1 > 0 && is+1 < filter2.Len() )
-                {
-                    if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
-//                    if( filter2.Mid(is+1,i-is-1) == defaultExtension )
-                    {
-                        filterFind = filterIndex;
-                        break;
-                    }
-                }
-            }
-        }
+#ifndef OFN_EXPLORER
+    #define OFN_EXPLORER 0x00080000
+#endif

 
 

-        fileDialog.SetFilterIndex(filterFind);
-    }
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

-    if ( fileDialog.ShowModal() == wxID_OK )
-    {
-        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());
-        return wxBuffer;
-    }
-    else
-        return wxGetEmptyString();
-}
+#ifdef __WIN32__
+# define wxMAXPATH   65534
+#else
+# define wxMAXPATH   1024
+#endif

 
 

-# if __BORLANDC__
-#   include <dir.h>  // for MAXPATH etc. ( Borland 3.1 )
-# endif
+# define wxMAXFILE   1024

 
 

-# ifndef MAXPATH
-# define MAXPATH   400
-# endif
+# define wxMAXEXT    5

 
 

-# ifndef MAXDRIVE
-# define MAXDRIVE  3
-# endif
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-# ifndef MAXFILE
-# define MAXFILE   9
-# endif
+IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)

 
 

-# ifndef MAXEXT
-# define MAXEXT    5
-# endif
+// ----------------------------------------------------------------------------
+// wxFileDialog
+// ----------------------------------------------------------------------------

 
 

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

 
 

-wxString wxFileSelectorEx(const wxChar *title,
-                       const wxChar *defaultDir,
-                       const wxChar *defaultFileName,
-                       int* defaultFilterIndex,
-                       const wxChar *filter,
-                       int       flags,
-                       wxWindow* parent,
-                       int       x,
-                       int       y)
+{
+    if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
+        m_dialogStyle &= ~wxMULTIPLE;
+}

 
 

+void wxFileDialog::GetPaths(wxArrayString& paths) const

 {
 {

-    wxFileDialog fileDialog(parent, title ? title : _T(""), defaultDir ? defaultDir : _T(""),
-        defaultFileName ? defaultFileName : _T(""), filter ? filter : _T(""), 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();
-        wxStrcpy(wxBuffer, (const wxChar *)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
+{
+    files = m_fileNames;
+}
+
+void wxFileDialog::SetPath(const wxString& path)

 {
 {

-    m_message = message;
-    m_dialogStyle = style;
-    m_parent = parent;
-    m_path = _T("");
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_filterIndex = 1;
+    wxString ext;
+    wxSplitPath(path, &m_dir, &m_fileName, &ext);
+    if ( !ext.empty() )
+        m_fileName << _T('.') << ext;

 }
 
 }
 

-int wxFileDialog::ShowModal(void)
+int wxFileDialog::ShowModal()

 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();

+    if (!hWnd && wxTheApp->GetTopWindow())
+        hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND();

 
 

-    static wxChar fileNameBuffer [ MAXPATH ];           // the file-name
-    wxChar        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 = _T('\0');
-    *titleBuffer    = _T('\0');
+    *fileNameBuffer = wxT('\0');
+    *titleBuffer    = wxT('\0');

 
     long msw_flags = 0;
     if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )
 
     long msw_flags = 0;
     if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) )


@@ -204,33 +145,83 @@ int wxFileDialog::ShowModal(void)
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
 
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
 

-    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
+    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.lStructSize       = sizeof(OPENFILENAME);

+#endif
+

     of.hwndOwner         = hWnd;
     of.lpstrTitle        = WXSTRINGCAST m_message;
     of.hwndOwner         = hWnd;
     of.lpstrTitle        = WXSTRINGCAST m_message;

-
-

     of.lpstrFileTitle    = titleBuffer;
     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
 
     // 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] == _T('/'))
-            m_dir[i] = _T('\\');
+    // forward slashes) and also squeeze multiple consecutive slashes into one
+    // as it doesn't like two backslashes in a row neither

 
 

-    of.lpstrInitialDir   = m_dir.c_str();
+    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('\\');
+
+                // fall through
+
+            case _T('\\'):
+                while ( i < len - 1 )
+                {
+                    wxChar chNext = m_dir[i + 1];
+                    if ( chNext != _T('\\') && chNext != _T('/') )
+                        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;
+        }
+    }
+
+    of.lpstrInitialDir   = dir.c_str();

 
     of.Flags             = msw_flags;
 
 
     of.Flags             = msw_flags;
 


@@ -250,12 +241,12 @@ int wxFileDialog::ShowModal(void)
 
     wxString theFilter;
     if ( wxStrlen(m_wildCard) == 0 )
 
     wxString theFilter;
     if ( wxStrlen(m_wildCard) == 0 )

-        theFilter = wxString(_T("*.*"));
+        theFilter = wxString(wxT("*.*"));

     else
         theFilter = m_wildCard ;
     wxString filterBuffer;
 
     else
         theFilter = m_wildCard ;
     wxString filterBuffer;
 

-    if ( !wxStrchr( theFilter, _T('|') ) ) {    // only one filter ==> default text
+    if ( !wxStrchr( theFilter, wxT('|') ) ) {    // only one filter ==> default text

         filterBuffer.Printf(_("Files (%s)|%s"),
                             theFilter.c_str(), theFilter.c_str());
     }
         filterBuffer.Printf(_("Files (%s)|%s"),
                             theFilter.c_str(), theFilter.c_str());
     }


@@ -264,128 +255,138 @@ int wxFileDialog::ShowModal(void)
 
     }
 
 
     }
 

-    filterBuffer += _T("|");
+    filterBuffer += wxT("|");

     // Replace | with \0
     for (i = 0; i < filterBuffer.Len(); i++ ) {
     // Replace | with \0
     for (i = 0; i < filterBuffer.Len(); i++ ) {

-        if ( filterBuffer.GetChar(i) == _T('|') ) {
-            filterBuffer[i] = _T('\0');
+        if ( filterBuffer.GetChar(i) == wxT('|') ) {
+            filterBuffer[i] = wxT('\0');

         }
     }
 
     of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;
         }
     }
 
     of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;

-    of.nFilterIndex = m_filterIndex;
+    of.nFilterIndex = m_filterIndex + 1;

 
     //=== Setting defaultFileName >>=========================================
 
 
     //=== Setting defaultFileName >>=========================================
 

-    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, MAXPATH-1 );
-    fileNameBuffer[ MAXPATH-1 ] = _T('\0');
+    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
+    fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');

 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename

-    of.nMaxFile  = MAXPATH;
+    of.nMaxFile  = wxMAXPATH;

 
     //== Execute FileDialog >>=================================================
 
 
     //== Execute FileDialog >>=================================================
 

-    bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
-                                            : (GetOpenFileName(&of) != 0);
+    bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
+                                           : GetOpenFileName(&of)) != 0;

 
 

-    if ( success )
-    {
-        const wxChar* extension = NULL;
+    DWORD errCode = CommDlgExtendedError();

 
 

-        //=== Adding the correct extension >>=================================
-
-        m_filterIndex = (int)of.nFilterIndex;
-
-        if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != _T('.') )
-        {                                    // 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;
-            }
+#ifdef __WIN32__
+    if (!success && (errCode == CDERR_STRUCTSIZE))
+    {
+        // The struct size has changed so try a smaller or bigger size

 
 

-            extension = wxStrrchr( extension, _T('.') );
-            if (  extension                                 // != "blabla"
-                    && !wxStrrchr( extension, _T('*') )       // != "blabla.*"
-                    && !wxStrrchr( extension, _T('?') )       // != "blabla.?"
-                    && extension[1]                           // != "blabla."
-                    && extension[1] != _T(' ') )              // != "blabla. "
-            {
-                // now concat extension to the fileName:
-                m_fileName = wxString(fileNameBuffer) + extension;
+        int oldStructSize = of.lStructSize;
+        of.lStructSize       = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD));
+        success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
+                                            : (GetOpenFileName(&of) != 0);
+        errCode = CommDlgExtendedError();

 
 

-                int len = wxStrlen( fileNameBuffer );
-                wxStrncpy( fileNameBuffer + len, extension, MAXPATH - len );
-                fileNameBuffer[ MAXPATH -1 ] = _T('\0');
-            }
+        if (!success && (errCode == CDERR_STRUCTSIZE))
+        {
+            of.lStructSize       = oldStructSize + (sizeof(void *) + 2*sizeof(DWORD));
+            success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
+                                            : (GetOpenFileName(&of) != 0);

         }
         }

+    }
+#endif // __WIN32__

 
 

-        m_path = fileNameBuffer;
-        m_fileName = wxFileNameFromPath(fileNameBuffer);
-
-
-        //=== Simulating the wxOVERWRITE_PROMPT >>============================
-
-        if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
-             ::wxFileExists( fileNameBuffer ) )
+    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
+           )

         {
         {

-            wxString messageText;
-            messageText.Printf(_("Replace file '%s'?"), fileNameBuffer);
-
-            if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES )
+#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 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);
+                for( int i = 0; i < maxFilter; i++ )           // get extension
+                    extension = extension + wxStrlen( extension ) + 1;

 
 

-  const wxChar *ext = extension;
-  if (*ext == _T('.'))
-      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(_T("*.%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 wxChar *what,
-                                        const wxChar *extension,
-                                        const wxChar *default_name,
-                                        wxWindow *parent)
-{
-    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);

 }
 
 }
 

-// Generic file save dialog
-WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
-                                        const wxChar *extension,
-                                        const wxChar *default_name,
-                                        wxWindow *parent)
-{
-    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
-}
+#endif // wxUSE_FILEDLG