The octal escaping code needs to escape the escape character

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 7e59525d7b682a1e3b3cf4b04a2954a59a4a8df3..abf12be7982ea036afa0cc519a0f160ff98102ef 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -28,7 +28,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
+#if wxUSE_FILEDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -40,18 +40,14 @@
     #include "wx/app.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/msw/wrapcdlg.h"
 
-#if !defined(__WIN32__) || defined(__WXWINCE__)
-    #include <commdlg.h>
-#endif
-
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"
+#include "wx/math.h"
 
 #include "wx/msw/missing.h"
 
@@ -299,8 +295,8 @@ int wxFileDialog::ShowModal()
     // forward slashes) and also squeeze multiple consecutive slashes into one
     // as it doesn't like two backslashes in a row neither
 
-    wxString   dir;
-    size_t     i, len = m_dir.length();
+    wxString  dir;
+    size_t    i, len = m_dir.length();
     dir.reserve(len);
     for ( i = 0; i < len; i++ )
     {
@@ -395,8 +391,6 @@ int wxFileDialog::ShowModal()
         }
     }
 
-     //== Execute FileDialog >>=================================================
-
     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
@@ -511,5 +505,5 @@ int wxFileDialog::ShowModal()
 
 }
 
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)