git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34926
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
// if so, then we can check for the version
if ( dllComCtl32.IsLoaded() )
{
// 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
#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_*
{
DWORD cbSize;
DWORD dwMajorVersion; // Major version
DWORD dwMinorVersion; // Minor version
DWORD dwBuildNumber; // Build number
DWORD dwPlatformID; // DLLVER_PLATFORM_*
typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(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 )
{
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
if ( pfnDllGetVersion )
{