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

MSVC 5 compilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-16 21:39:23 +00:00
parent 4b20974a9b
commit 548bf4b717
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/app.cpp
View File

@@ -871,6 +871,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() )
{ {
#ifdef DLLVER_PLATFORM_WINDOWS
// try to use DllGetVersion() if available in _headers_ // try to use DllGetVersion() if available in _headers_
wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 ); wxDYNLIB_FUNCTION( DLLGETVERSIONPROC, DllGetVersion, dllComCtl32 );
if ( pfnDllGetVersion ) if ( pfnDllGetVersion )
@@ -892,6 +893,7 @@ int wxApp::GetComCtl32Version()
dvi.dwMinorVersion; dvi.dwMinorVersion;
} }
} }
#endif
// if DllGetVersion() is unavailable either during compile or // if DllGetVersion() is unavailable either during compile or
// run-time, try to guess the version otherwise // run-time, try to guess the version otherwise

4
src/msw/basemsw.cpp
View File

@@ -28,6 +28,10 @@
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/apptrait.h" #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" #include "wx/msw/private.h"