OW pedantic warning fix.

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 64ea13114310a536679e450663793536e052a346..d3d3e62a5c941fbb7ca17cf67736b688105536ac 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -68,6 +68,10 @@
     #define  wxUSE_OLE 0
 #endif // broken compilers
 
     #define  wxUSE_OLE 0
 #endif // broken compilers
 

+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+#include <aygshell.h>
+#endif
+

 #if wxUSE_OLE
     #include <ole2.h>
 #endif
 #if wxUSE_OLE
     #include <ole2.h>
 #endif


@@ -82,12 +86,6 @@
 #include "wx/msw/wince/missing.h"
 #endif
 
 #include "wx/msw/wince/missing.h"
 #endif
 

-#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \
-    !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \
-    (!defined(_MSC_VER) || (_MSC_VER > 1100))
-    #include <shlwapi.h>
-#endif
-

 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------


@@ -300,6 +298,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     InitCommonControls();
 #endif // __WIN95__
 
     InitCommonControls();
 #endif // __WIN95__
 

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    SHInitExtraControls();
+#endif
+

     wxOleInitialize();
 
     RegisterWindowClasses();
     wxOleInitialize();
 
     RegisterWindowClasses();