]> git.saurik.com Git - wxWidgets.git/commitdiff
MSVC 5 compilation fixes.
authorMattia Barbon <mbarbon@cpan.org>
Sat, 16 Aug 2003 21:39:23 +0000 (21:39 +0000)
committerMattia Barbon <mbarbon@cpan.org>
Sat, 16 Aug 2003 21:39:23 +0000 (21:39 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/app.cpp
src/msw/basemsw.cpp

index 7af9c7108abae72ebaaece105e147fcad5c13719..ec3c4c0124c042290e1c7da37633fb0a59e4f043 100644 (file)
@@ -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
index 6120c9e472e2032093b54508b9b094b710d0e228..76cbb8ad4b06074a48fec8527a4fb316ed9d019b 100644 (file)
 #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"