X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e3d05fc8601ef8d6eb2a695aba83d48ac1ca1b2..3c203a185145a1aa720faf53e7f6fbebb35bce7a:/src/msw/app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index d3d3e62a5c..2c0de2d845 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -86,6 +86,13 @@
 #include "wx/msw/wince/missing.h"
 #endif
 
+// For DLLVER_PLATFORM_WINDOWS
+#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
 // ---------------------------------------------------------------------------
@@ -605,7 +612,17 @@ int wxApp::GetComCtl32Version()
         // if so, then we can check for the version
         if ( dllComCtl32.IsLoaded() )
         {
-#ifdef DLLVER_PLATFORM_WINDOWS
+#ifndef DLLVER_PLATFORM_WINDOWS
+			typedef 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_
             wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
             if ( pfnDllGetVersion )
@@ -627,7 +644,6 @@ int wxApp::GetComCtl32Version()
                                         dvi.dwMinorVersion;
                 }
             }
-#endif
 
             // if DllGetVersion() is unavailable either during compile or
             // run-time, try to guess the version otherwise