#if wxUSE_DATAOBJ guard src/gtk/dataobj.cpp

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 529d6688c06d53e604c2718793ed0223cb449f66..419870ccdf737ec0d521e6f4eec03819b23bee59 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -69,7 +69,8 @@
 #endif // broken compilers
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-#include <aygshell.h>
+    #include <ole2.h>
+    #include <aygshell.h>
 #endif
 
 #if wxUSE_OLE
@@ -591,18 +592,21 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
+            // check is struct used by DllGetVersion() is available in the
+            // headers and define it ourselves if it isn't
 #ifndef DLLVER_PLATFORM_WINDOWS
-                       typedef struct _DllVersionInfo
+                       struct DLLVERSIONINFO
                        {
                                DWORD cbSize;
                                DWORD dwMajorVersion;                   // Major version
                                DWORD dwMinorVersion;                   // Minor version
                                DWORD dwBuildNumber;                    // Build number
                                DWORD dwPlatformID;                     // DLLVER_PLATFORM_*
-                       } DLLVERSIONINFO;
+                       };
                        typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-#endif
-            // try to use DllGetVersion() if available in _headers_
+#endif // defined(DLLVERSIONINFO)
+
+            // now check if it's available during run-time
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
             {