X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/574c0bbfbd2096f7ee0d10ad7222bb012e6f5ad7..0f3e3e0c300988a7520b39b90d28517b84882190:/src/msw/filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index c596792816..cf53ed8159 100644
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -222,12 +222,19 @@ int wxFileDialog::ShowModal(void)
     of.lpstrFileTitle    = titleBuffer;
     of.nMaxFileTitle     = MAXFILE + 1 + MAXEXT;    // 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] == '/')
+            m_dir[i] = '\\';
+
     of.lpstrInitialDir   = (const char *) m_dir;
 
     of.Flags             = msw_flags;
 
 
-
     //=== Like Alejandro Sierra's wildcard modification >>===================
     /*
        In wxFileSelector you can put, instead of a single wild_card,
@@ -241,7 +248,11 @@ int wxFileDialog::ShowModal(void)
      */
     //=======================================================================
 
-    wxString theFilter = ( Strlen(m_wildCard) == 0 ) ? wxString("*.*") : m_wildCard;
+    wxString theFilter;
+    if ( Strlen(m_wildCard) == 0 )
+        theFilter = wxString("*.*");
+    else
+        theFilter = m_wildCard ;
     wxString filterBuffer;
 
     if ( !strchr( theFilter, '|' ) ) {    // only one filter ==> default text
@@ -255,7 +266,7 @@ int wxFileDialog::ShowModal(void)
 
     filterBuffer += "|";
     // Replace | with \0
-    for ( unsigned int i = 0; i < filterBuffer.Len(); i++ ) {
+    for (i = 0; i < filterBuffer.Len(); i++ ) {
         if ( filterBuffer.GetChar(i) == '|' ) {
             filterBuffer[i] = '\0';
         }