many improvements/bug fixes to media control: new wxEVT_MEDIA_LOADED event, new metho...

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

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index a474faac76fcc226a93b8d95b84b5130ebed659e..a31464cb56ba6c7df176d95f76997b370d5cdb9e 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -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"
 
@@ -86,7 +82,7 @@ IMPLEMENT_CLASS(wxFileDialog, wxFileDialogBase)
 // hook function for moving the dialog
 // ----------------------------------------------------------------------------
 
-UINT APIENTRY
+UINT_PTR APIENTRY
 wxFileDialogHookFunction(HWND      hDlg,
                          UINT      iMsg,
                          WPARAM    WXUNUSED(wParam),
@@ -395,8 +391,6 @@ int wxFileDialog::ShowModal()
         }
     }
 
-     //== Execute FileDialog >>=================================================
-
     //== Execute FileDialog >>=================================================
 
     bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)