X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b11099dd69b60d2fa5240df8e4137d21d97f21d..d44d0cbd7343e36ddd3657dd97cd5eb7018d2585:/src/msw/filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 541ea70c69..abf12be798 100644
--- 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,22 +40,16 @@
     #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"
 
-#ifndef OFN_EXPLORER
-    #define OFN_EXPLORER 0x00080000
-#endif
+#include "wx/msw/missing.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -252,8 +246,13 @@ int wxFileDialog::ShowModal()
         programmer needs the PLACES BAR (left side of dlg) they
         just shouldn't move or center the dlg.
     */
-    if (m_bMovedWindow) // we need the these flags.
-        msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK|OFN_ENABLESIZING;
+    if (m_bMovedWindow) // we need these flags.
+    {
+        msw_flags |= OFN_EXPLORER|OFN_ENABLEHOOK;
+#ifndef __WXWINCE__
+        msw_flags |= OFN_ENABLESIZING;
+#endif
+    }
 
     if (m_dialogStyle & wxMULTIPLE )
     {
@@ -296,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++ )
     {
@@ -392,8 +391,6 @@ int wxFileDialog::ShowModal()
         }
     }
 
-     //== Execute FileDialog >>=================================================
-
     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
@@ -508,5 +505,5 @@ int wxFileDialog::ShowModal()
 
 }
 
-#endif // wxUSE_FILEDLG
+#endif // wxUSE_FILEDLG && !(__SMARTPHONE__ && __WXWINCE__)