MSVC 5 compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4b20974a9b
commit
548bf4b717
@ -871,6 +871,7 @@ int wxApp::GetComCtl32Version()
|
||||
// if so, then we can check for the version
|
||||
if ( dllComCtl32.IsLoaded() )
|
||||
{
|
||||
#ifdef DLLVER_PLATFORM_WINDOWS
|
||||
// try to use DllGetVersion() if available in _headers_
|
||||
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
|
||||
if ( pfnDllGetVersion )
|
||||
@ -892,6 +893,7 @@ int wxApp::GetComCtl32Version()
|
||||
dvi.dwMinorVersion;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// if DllGetVersion() is unavailable either during compile or
|
||||
// run-time, try to guess the version otherwise
|
||||
|
@ -28,6 +28,10 @@
|
||||
#endif //WX_PRECOMP
|
||||
|
||||
#include "wx/apptrait.h"
|
||||
// MBN: this is a workaround for MSVC 5: if it is not #included in
|
||||
// some wxBase file, wxRecursionGuard methods won't be exported from
|
||||
// wxBase.dll, and MSVC 5 will give linker errors
|
||||
#include "wx/recguard.h"
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user