fix to include correct files.lst for wxUniv

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 43cf9e9137b55b6bc9a6304a5b7cc63e5f45c497..29ba5231bd378215943ce1783e62dc08e7423762 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -1,356 +1,518 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "filedlg.h"
+    #pragma implementation "filedlg.h"

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_FILEDLG
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/filedlg.h"
+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"
+    #include "wx/dialog.h"
+    #include "wx/filedlg.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

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

 
 

-#ifndef __WIN32__
-#include <commdlg.h>
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
+    #include <commdlg.h>

 #endif
 
 #endif
 

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

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

-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
+#include "wx/tokenzr.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+# define wxMAXPATH   4096
+#else
+# define wxMAXPATH   1024

 #endif
 
 #endif
 

-char *wxFileSelector(const char *title,
-                     const char *defaultDir, const char *defaultFileName,
-                     const char *defaultExtension, const char *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("*.") + wxString(defaultExtension) ;
-       else if ( filter )
-               filter2 = filter;
-
-       wxString defaultDirString;
-       if (defaultDir)
-               defaultDirString = defaultDir;
-       else
-               defaultDirString = "";
-
-       wxString defaultFilenameString;
-       if (defaultFileName)
-               defaultFilenameString = defaultFileName;
-       else
-               defaultFilenameString = "";
-
-       wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y));
-
-       if ( fileDialog.ShowModal() == wxID_OK )
-       {
-               strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-               return wxBuffer;
-       }
-       else
-               return NULL;
-}
+# define wxMAXFILE   1024
+
+# define wxMAXEXT    5
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxFileDialog, wxDialog)

 
 

-# if __BORLANDC__
-#   include <dir.h>  // for MAXPATH etc. ( Borland 3.1 ) 
-# endif
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+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(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;

 
 

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

 
 

-# ifndef MAXDRIVE
-# define MAXDRIVE  3
-# endif
+        fileDialog.SetFilterIndex(filterFind);
+    }

 
 

-# ifndef MAXFILE 
-# define MAXFILE   9
-# endif
+    wxString filename;
+    if ( fileDialog.ShowModal() == wxID_OK )
+    {
+        filename = fileDialog.GetPath();
+    }

 
 

-# ifndef MAXEXT
-# define MAXEXT    5
-# endif
+    return filename;
+}

 
 
 
 

-char *wxFileSelectorEx( const char *title,
-                       const char *defaultDir,
-                       const char *defaultFileName,
-                       int* defaultFilterIndex,
-                       const char *filter,
-            const int       flags,
-            wxWindow* parent,
-            const int       x,
-            const int       y)
+wxString wxFileSelectorEx(const wxChar *title,
+                       const wxChar *defaultDir,
+                       const wxChar *defaultFileName,
+                       int* defaultFilterIndex,
+                       const wxChar *filter,
+                       int       flags,
+                       wxWindow* parent,
+                       int       x,
+                       int       y)

 
 {
 
 {

-       wxFileDialog fileDialog(parent, title ? title : "", defaultDir ? defaultDir : "",
-        defaultFileName ? defaultFileName : "", filter ? filter : "", flags, wxPoint(x, y));
-
-       if ( fileDialog.ShowModal() == wxID_OK )
-       {
-               *defaultFilterIndex = fileDialog.GetFilterIndex();
-               strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-               return wxBuffer;
-       }
-       else
-               return NULL;
+    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();
+
+        filename = fileDialog.GetPath();
+    }
+
+    return filename;

 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,

-        long style, const wxPoint& pos)
+        long style, const wxPoint& WXUNUSED(pos))

 {
     m_message = message;
     m_dialogStyle = style;
 {
     m_message = message;
     m_dialogStyle = style;

+    if ( ( m_dialogStyle & wxMULTIPLE ) && ( m_dialogStyle & wxSAVE ) )
+        m_dialogStyle &= ~wxMULTIPLE;

     m_parent = parent;
     m_parent = parent;

-       m_path = "";
-       m_fileName = defaultFileName;
-       m_dir = defaultDir;
-       m_wildCard = wildCard;
-       m_filterIndex = 1;
+    m_path = wxT("");
+    m_fileName = defaultFileName;
+    m_dir = defaultDir;
+    m_wildCard = wildCard;
+    m_filterIndex = 0;

 }
 
 }
 

-int wxFileDialog::ShowModal(void)
+void wxFileDialog::GetPaths(wxArrayString& paths) const

 {
 {

-  HWND hWnd = 0;
-  if (m_parent) hWnd = (HWND) m_parent->GetHWND();
-
-       static char  fileNameBuffer [ MAXPATH ];                   // the file-name
-       char         titleBuffer    [ MAXFILE+1+MAXEXT ];  // the file-name, without path
-
-       *fileNameBuffer = '\0';
-    *titleBuffer    = '\0';
-
-       char* filterBuffer = NULL;
-       char* extension    = NULL;
-       char* theFilter    = (char *)(const char *)m_wildCard;
-
-    long msw_flags = 0;
-    if ( (m_dialogStyle & wxHIDE_READONLY) || (m_dialogStyle & wxSAVE) ) { msw_flags |= OFN_HIDEREADONLY; }
+    paths.Empty();

 
 

+    wxString dir(m_dir);
+    if ( m_dir.Last() != _T('\\') )
+        dir += _T('\\');

 
 

-       OPENFILENAME of;
-       memset(&of, 0, sizeof(OPENFILENAME));
+    size_t count = m_fileNames.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        paths.Add(dir + m_fileNames[n]);
+    }
+}

 
 

-    of.lpstrCustomFilter = NULL;   // system should not save custom filter
-       of.nMaxCustFilter    = 0L;
+int wxFileDialog::ShowModal()
+{
+    HWND hWnd = 0;
+    if (m_parent) hWnd = (HWND) m_parent->GetHWND();
+    if (!hWnd && wxTheApp->GetTopWindow())
+        hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND();

 
 

-       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
+    static wxChar fileNameBuffer [ wxMAXPATH ];           // the file-name
+    wxChar        titleBuffer    [ wxMAXFILE+1+wxMAXEXT ];  // the file-name, without path

 
 

-       of.lStructSize           = sizeof(OPENFILENAME);
-       of.hwndOwner             = hWnd;
-       of.lpstrTitle        = (char *)(const char *)m_message;
+    *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 )
+        msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
+    if (m_dialogStyle & wxMULTIPLE )
+        msw_flags |=
+#if defined(OFN_EXPLORER)
+        OFN_EXPLORER |
+#endif // OFN_EXPLORER
+        OFN_ALLOWMULTISELECT;
+
+    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);
+#endif

 
 

-       of.lpstrFileTitle    = titleBuffer;
-       of.nMaxFileTitle     = MAXFILE + 1 + MAXEXT;    // Windows 3.0 and 3.1
+    of.hwndOwner         = hWnd;
+    of.lpstrTitle        = WXSTRINGCAST m_message;
+    of.lpstrFileTitle    = titleBuffer;
+    of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;    // Windows 3.0 and 3.1

 
 

-       of.lpstrInitialDir   = (const char *) m_dir;
+    // 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('\\');

 
 

-       of.Flags                         = msw_flags;
+    of.lpstrInitialDir   = m_dir.c_str();

 
 

+    of.Flags             = msw_flags;

 
 
     //=== Like Alejandro Sierra's wildcard modification >>===================
     /*
 
 
     //=== 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.
+       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.

 
 

-        eg.  "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2"
+       eg.  "description1 (*.ex1)|*.ex1|description2 (*.ex2)|*.ex2"

 
 

-        If you put a single wild card, it works as before the modification.
-    */
+       If you put a single wild card, it works as before the modification.
+     */

     //=======================================================================
 
     //=======================================================================
 

-       if ( !theFilter || (strcmp(theFilter, "") == 0)) theFilter = "*.*";
-
-       int filterBufferLen = 0;
-
-       if ( !strchr( theFilter, '|' ) ) {                      // only one filter ==> default text:
-               char buffText[] = "Files (%s)|%s";
-               filterBufferLen = strlen( theFilter )*2 + strlen( buffText ) -4;
-               filterBuffer    = new char[ filterBufferLen +2 ];
-
-               if ( filterBuffer ) {
-                       sprintf( filterBuffer, buffText, theFilter, theFilter );
-               }
-       }
-       else {                                                          // more then one filter
-               filterBufferLen = strlen( theFilter );
-               filterBuffer    = new char[ filterBufferLen +2 ];
+    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;
+
+    }
+
+    filterBuffer += wxT("|");
+    // Replace | with \0
+    for (i = 0; i < filterBuffer.Len(); i++ ) {
+        if ( filterBuffer.GetChar(i) == wxT('|') ) {
+            filterBuffer[i] = wxT('\0');
+        }
+    }
+
+    of.lpstrFilter  = (LPTSTR)(const wxChar *)filterBuffer;
+    of.nFilterIndex = m_filterIndex + 1;

 
 

-               if ( filterBuffer ) {
-                       strcpy( filterBuffer, theFilter );
-           }
-       }
+    //=== Setting defaultFileName >>=========================================

 
 

-    if ( filterBuffer ) {                                          // Substituting '|' with '\0'
-               for ( int i = 0; i < filterBufferLen; i++ ) {
-                       if ( filterBuffer[i] == '|' ) { filterBuffer[i] = '\0'; }
-               }
-       }
+    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
+    fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');

 
 

-       filterBuffer[filterBufferLen+1] = '\0';
+    of.lpstrFile = fileNameBuffer;  // holds returned filename
+    of.nMaxFile  = wxMAXPATH;

 
 

-       of.lpstrFilter  = (LPSTR)filterBuffer;
-       of.nFilterIndex = m_filterIndex;
+    //== Execute FileDialog >>=================================================

 
 

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

 
 

-    strncpy( fileNameBuffer, (const char *)m_fileName, MAXPATH-1 );
-    fileNameBuffer[ MAXPATH-1 ] = '\0';
+    DWORD errCode = CommDlgExtendedError();

 
 

-       of.lpstrFile = fileNameBuffer;  // holds returned filename
-       of.nMaxFile  = MAXPATH;
+#ifdef __WIN32__
+    if (!success && (errCode == CDERR_STRUCTSIZE))
+    {
+        // The struct size has changed so try a smaller or bigger size

 
 

-    //== Execute FileDialog >>=================================================
+        int oldStructSize = of.lStructSize;
+        of.lStructSize       = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD));
+        success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
+                                            : (GetOpenFileName(&of) != 0);
+        errCode = CommDlgExtendedError();

 
 

-    bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0) : (GetOpenFileName(&of) != 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

 
     if ( success )
     {
 
     if ( success )
     {

-        //=== Adding the correct extension >>=================================
+        m_fileNames.Empty();
+
+        if ( ( m_dialogStyle & wxMULTIPLE ) &&
+#if defined(OFN_EXPLORER)
+             ( fileNameBuffer[of.nFileOffset-1] == wxT('\0') ) )
+#else
+             ( fileNameBuffer[of.nFileOffset-1] == wxT(' ') ) )
+#endif // OFN_EXPLORER
+        {
+#if defined(OFN_EXPLORER)
+            m_dir = fileNameBuffer;
+            i = of.nFileOffset;
+            m_fileName = &fileNameBuffer[i];
+            m_fileNames.Add(m_fileName);
+            i += m_fileName.Len() + 1;
+
+            while (fileNameBuffer[i] != wxT('\0'))
+            {
+                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
+        {
+            const wxChar* extension = NULL;

 
 

-        m_filterIndex = (int)of.nFilterIndex;
+            //=== Adding the correct extension >>=================================

 
 

-           if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != '.' )
-        {                                    // user has typed an filename
-                                             // without an extension:
+            m_filterIndex = (int)of.nFilterIndex - 1;

 
 

-               int   maxFilter = (int)(of.nFilterIndex*2L-1L);
-               extension       = filterBuffer;
+            if ( !of.nFileExtension || (of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.')) )
+            {                                    // user has typed an filename
+                // without an extension:

 
 

-               for( int i = 0; i < maxFilter; i++ ) {              // get extension
-                       extension = extension + strlen( extension ) +1;
-               }
+                int   maxFilter = (int)(of.nFilterIndex*2L-1L);
+                extension = filterBuffer;

 
 

-               if (  (extension = strrchr( extension, '.' ))   // != "blabla" 
-                             && !strrchr( extension, '*' )             // != "blabla.*"
-                             && !strrchr( extension, '?' )             // != "blabla.?"
-                             && extension[1]                           // != "blabla."
-                             && extension[1] != ' ' )                  // != "blabla. "
-               {
-                              // now concat extension to the fileName:
-                               m_fileName = wxString(fileNameBuffer) + wxString(extension);
+                for( int i = 0; i < maxFilter; i++ ) {          // get extension
+                    extension = extension + wxStrlen( extension ) +1;
+                }

 
 

-                int len = strlen( fileNameBuffer );
-                   strncpy( fileNameBuffer + len, extension, MAXPATH - len );
-                fileNameBuffer[ MAXPATH -1 ] = '\0';
+                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_path = fileNameBuffer;
+            m_fileName = wxFileNameFromPath(fileNameBuffer);
+            m_fileNames.Add(m_fileName);
+            m_dir = wxPathOnly(fileNameBuffer);
+        }

 
 
 
 

-           //=== Simulating the wxOVERWRITE_PROMPT >>============================
+        //=== Simulating the wxOVERWRITE_PROMPT >>============================

 
 

-           if ( (m_dialogStyle & wxOVERWRITE_PROMPT) && ::wxFileExists( fileNameBuffer ) )
+        if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+             ::wxFileExists( fileNameBuffer ) )

         {
         {

-                   char  questionText[] = "Replace file\n%s?";
-                   char* messageText    = new char[strlen(questionText)+strlen(fileNameBuffer)-1];
-                   sprintf( messageText, questionText, fileNameBuffer );
+            wxString messageText;
+            messageText.Printf(_("Replace file '%s'?"), fileNameBuffer);

 
 

-                   if ( messageText && ( wxMessageBox( (const char *)messageText, m_message, wxYES_NO ) != wxYES ) )
+            if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES )

             {
                 success = FALSE;
             {
                 success = FALSE;

-                   }
-
-                   delete[] messageText;
-           }
-
-    } // END: if ( success )
-
+            }
+        }

 
 

-    delete[] filterBuffer;
+    }
+    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) ;
+    return success ? wxID_OK : wxID_CANCEL;

 
 }
 
 
 }
 

-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-// Generic file load/save dialog
-// static inline char * // HP compiler complains
-static char *
-wxDefaultFileSelector(bool load, const char *what, const char *extension, const char *default_name, wxWindow *parent)
+// 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)

 {
 {

-  char *ext = (char *)extension;
-  
-  char prompt[50];
+  wxString prompt;

   wxString str;
   wxString str;

-  if (load)
-       str = (const char*) wxTString("Load %s file");
-  else
-       str = (const char*) wxTString("Save %s file");
-  sprintf(prompt, str, what);
+  if (load) str = _("Load %s file");
+  else str = _("Save %s file");
+  prompt.Printf(str, what);
+
+  const wxChar *ext = extension;
+  if (*ext == wxT('.'))
+      ext++;

 
 

-  if (*ext == '.') ext++;
-  char wild[60];
-  sprintf(wild, "*.%s", ext);
+  wxString wild;
+  wild.Printf(wxT("*.%s"), ext);

 
   return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog
 
   return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
 }
 
 // Generic file load dialog

-char *
-wxLoadFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+WXDLLEXPORT wxString wxLoadFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,
+                                        wxWindow *parent)

 {
 {

-  return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(TRUE, what, extension, default_name, parent);

 }
 
 }
 

-

 // Generic file save dialog
 // Generic file save dialog

-char *
-wxSaveFileSelector(const char *what, const char *extension, const char *default_name, wxWindow *parent)
+WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
+                                        const wxChar *extension,
+                                        const wxChar *default_name,
+                                        wxWindow *parent)

 {
 {

-  return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
+    return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);

 }
 
 }
 

+#endif // wxUSE_FILEDLG