Added C/wxString array constructors to wxArrayString

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index a474faac76fcc226a93b8d95b84b5130ebed659e..abf12be7982ea036afa0cc519a0f160ff98102ef 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -40,18 +40,14 @@
     #include "wx/app.h"
 #endif
 
     #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 <stdlib.h>
 #include <string.h>
 
 #include "wx/filename.h"
 #include "wx/tokenzr.h"

+#include "wx/math.h"

 
 #include "wx/msw/missing.h"
 
 
 #include "wx/msw/missing.h"
 


@@ -395,8 +391,6 @@ int wxFileDialog::ShowModal()
         }
     }
 
         }
     }
 

-     //== Execute FileDialog >>=================================================
-

     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)