X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/app.cpp?ds=sidebyside diff --git a/src/msw/app.cpp b/src/msw/app.cpp index e553e03534..ec3c4c0124 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -88,8 +88,8 @@ #include "wx/msw/wrapcctl.h" #if (!defined(__MINGW32__) || wxCHECK_W32API_VERSION( 2, 0 )) && \ - !defined(__CYGWIN__) && !defined(__WXWINCE__) && \ - (!defined(_MSC_VER) || (_MSC_VER > 1100)) + !defined(__CYGWIN__) && !defined(__DIGITALMARS__) && !defined(__WXWINCE__) && \ + (!defined(_MSC_VER) || (_MSC_VER > 1100)) #include #endif @@ -847,7 +847,8 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) /* static */ int wxApp::GetComCtl32Version() { -#if defined(__WXMICROWIN__) || defined(__WXWINCE__) +//FIX ME FOR DIGITALMARS!! +#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__) return 0; #else // cache the result @@ -870,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 ) @@ -891,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