Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't include shlwapi.h as it might be not available (modified patch 1228033)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-07-28 22:27:43 +00:00
parent fb6efdf277
commit 25a116143a
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/app.cpp
View File

@@ -87,12 +87,27 @@
#include "wx/msw/wince/missing.h" #include "wx/msw/wince/missing.h"
#endif #endif
// For DLLVER_PLATFORM_WINDOWS // instead of including <shlwapi.h> which is not part of the core SDK and not
#if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \ // shipped at all with other compilers, we always define the parts of it we
!defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \ // need here ourselves
(!defined(_MSC_VER) || (_MSC_VER > 1100)) //
#include <shlwapi.h> // NB: DLLVER_PLATFORM_WINDOWS will be defined if shlwapi.h had been somehow
#endif // included already
#ifndef DLLVER_PLATFORM_WINDOWS
// hopefully we don't need to change packing as DWORDs should be already
// correctly aligned
struct DLLVERSIONINFO
{
DWORD cbSize;
DWORD dwMajorVersion; // Major version
DWORD dwMinorVersion; // Minor version
DWORD dwBuildNumber; // Build number
DWORD dwPlatformID; // DLLVER_PLATFORM_*
};
typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
#endif // defined(DLLVERSIONINFO)
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// global variables // global variables
@@ -592,21 +607,7 @@ int wxApp::GetComCtl32Version()
// if so, then we can check for the version // if so, then we can check for the version
if ( dllComCtl32.IsLoaded() ) if ( dllComCtl32.IsLoaded() )
{ {
// check is struct used by DllGetVersion() is available in the // now check if the function is available during run-time
// headers and define it ourselves if it isn't
#ifndef DLLVER_PLATFORM_WINDOWS
struct DLLVERSIONINFO
{
DWORD cbSize;
DWORD dwMajorVersion; // Major version
DWORD dwMinorVersion; // Minor version
DWORD dwBuildNumber; // Build number
DWORD dwPlatformID; // DLLVER_PLATFORM_*
};
typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
#endif // defined(DLLVERSIONINFO)
// now check if it's available during run-time
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 ); wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
if ( pfnDllGetVersion ) if ( pfnDllGetVersion )
{ {