Add comment explaining the role of wxMacExecute

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index d3d3e62a5c941fbb7ca17cf67736b688105536ac..2c0de2d84579540d6b6e8f57d23ef6d464b84449 100644 (file)
--- 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