another segfault fix

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index c81dfcdf5255f5022c4f538c9a426c30fc5e3fff..89bf4ae96cd8a728ecebe4d31255b06c7228663f 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"


@@ -50,6 +52,10 @@
 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 

+#ifndef OFN_EXPLORER
+    #define OFN_EXPLORER 0x00080000
+#endif
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -118,7 +124,7 @@ wxString wxFileSelector(const wxChar *title,
                             flags, wxPoint(x, y));
     if( wxStrlen(defaultExtension) != 0 )
     {
                             flags, wxPoint(x, y));
     if( wxStrlen(defaultExtension) != 0 )
     {

-        int filterFind = 1,
+        int filterFind = 0,

             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )
             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )


@@ -127,7 +133,6 @@ wxString wxFileSelector(const wxChar *title,
             {
                 // save the start index of the new filter
                 unsigned int is = i++;
             {
                 // save the start index of the new filter
                 unsigned int is = i++;

-                filterIndex++;

 
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )
 
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )


@@ -139,25 +144,26 @@ wxString wxFileSelector(const wxChar *title,
                 if( i-is-1 > 0 && is+1 < filter2.Len() )
                 {
                     if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
                 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;
                     }
                 }
                     {
                         filterFind = filterIndex;
                         break;
                     }
                 }

+
+                filterIndex++;

             }
         }
 
         fileDialog.SetFilterIndex(filterFind);
     }
 
             }
         }
 
         fileDialog.SetFilterIndex(filterFind);
     }
 

+    wxString filename;

     if ( fileDialog.ShowModal() == wxID_OK )
     {
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());
-        return wxBuffer;
+        filename = fileDialog.GetPath();

     }
     }

-    else
-        return wxGetEmptyString();
+
+    return filename;

 }
 
 
 }
 
 


@@ -172,22 +178,28 @@ wxString wxFileSelectorEx(const wxChar *title,
                        int       y)
 
 {
                        int       y)
 
 {

-    wxFileDialog fileDialog(parent, title ? title : wxT(""), defaultDir ? defaultDir : wxT(""),
-        defaultFileName ? defaultFileName : wxT(""), filter ? filter : wxT(""), flags, wxPoint(x, y));
+    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 ( fileDialog.ShowModal() == wxID_OK )
     {

-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());
-        return wxBuffer;
+        if ( defaultFilterIndex )
+            *defaultFilterIndex = fileDialog.GetFilterIndex();
+
+        filename = fileDialog.GetPath();

     }
     }

-    else
-        return wxGetEmptyString();
+
+    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;


@@ -234,12 +246,24 @@ int wxFileDialog::ShowModal()
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

+

     if (m_dialogStyle & wxMULTIPLE )
     if (m_dialogStyle & wxMULTIPLE )

-        msw_flags |=
-#if defined(OFN_EXPLORER)
-        OFN_EXPLORER |
-#endif // OFN_EXPLORER
-        OFN_ALLOWMULTISELECT;
+    {
+        // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
+        msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
+    }
+
+    // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the
+    // standard dialog does by default
+    if ( !(m_dialogStyle & wxCHANGE_DIR) )
+    {
+        msw_flags |= OFN_NOCHANGEDIR;
+    }
+
+    if ( m_dialogStyle & wxOVERWRITE_PROMPT )
+    {
+        msw_flags |= OFN_OVERWRITEPROMPT;
+    }

 
     OPENFILENAME of;
     wxZeroMemory(of);
 
     OPENFILENAME of;
     wxZeroMemory(of);


@@ -261,14 +285,42 @@ int wxFileDialog::ShowModal()
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;    // Windows 3.0 and 3.1
 
     // Convert forward slashes to backslashes (file selector doesn't like
     of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;    // Windows 3.0 and 3.1
 
     // 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('\\');
+    // 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
+                    i++;
+                }
+                // fall through
+
+            default:
+                // normal char
+                dir += ch;
+        }
+    }
+
+    of.lpstrInitialDir   = dir.c_str();

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


@@ -323,8 +375,8 @@ int wxFileDialog::ShowModal()
 
     //== 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;

 
     DWORD errCode = CommDlgExtendedError();
 
 
     DWORD errCode = CommDlgExtendedError();
 


@@ -428,22 +480,6 @@ int wxFileDialog::ShowModal()
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }

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

     }
     else
     {
     }
     else
     {


@@ -472,20 +508,23 @@ wxString wxDefaultFileSelector(bool load,
                                const wxChar *default_name,
                                wxWindow *parent)
 {
                                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);
+    wxString prompt;
+    wxString str;
+    if (load)
+        str = _("Load %s file");
+    else
+        str = _("Save %s file");
+    prompt.Printf(str, what);

 
 

-  const wxChar *ext = extension;
-  if (*ext == wxT('.'))
-      ext++;
+    const wxChar *ext = extension;
+    if (*ext == wxT('.'))
+        ext++;

 
 

-  wxString wild;
-  wild.Printf(wxT("*.%s"), ext);
+    wxString wild;
+    wild.Printf(wxT("*.%s"), ext);

 
 

-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector(prompt, NULL, default_name, ext, wild,
+                          load ? wxOPEN : wxSAVE, parent);

 }
 
 // Generic file load dialog
 }
 
 // Generic file load dialog


@@ -506,4 +545,5 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 

+#endif // wxUSE_FILEDLG