WXDLLEXPORTLOCAL removed, WXDLLEXPORT seems to be enough

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index eaed27850c87d2a455da12e2dfb2b511f70aba2e..1aeb326354a93c6fa257ea581d5f1c3a892ed6d9 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -32,7 +32,7 @@
 
 #include <windows.h>
 
-#if !defined(__WIN32__) || defined(__SALFORDC__)
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
     #include <commdlg.h>
 #endif
 
@@ -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,
@@ -259,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';
         }