Try to find comctl32.dll version even if we don't have shlwapi.h available,

otherwise the version is wrongly guessed and we can end up with bad
toolbar backgrounds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-04-14 15:12:16 +00:00
parent e755eb67b6
commit f118960423

View File

@@ -612,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 )
@@ -634,7 +644,7 @@ int wxApp::GetComCtl32Version()
dvi.dwMinorVersion;
}
}
#endif
//#endif
// if DllGetVersion() is unavailable either during compile or
// run-time, try to guess the version otherwise