From f0facad09d3633455d338cba9036df6922c98cb4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 26 Nov 2012 15:51:04 +0000 Subject: [PATCH] Disable CallAfter() for MSVC 7 too, it can't compile this code. It was already disabled for VC6 but VC7 doesn't compile this code neither, so disable it for this compiler as well. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 8 ++++---- interface/wx/event.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index 99710b7..6e48055 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -33,11 +33,11 @@ #include "wx/meta/convertible.h" #endif -#include "wx/meta/removeref.h" +// Currently VC6 and VC7 are known to not be able to compile CallAfter() code, +// so disable it for them. +#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(8) + #include "wx/meta/removeref.h" -#ifdef wxHAS_REMOVEREF - // CallAfter() implementation requires wxRemoveRef(), so just disable it - // for compilers too broken to not allow defining it. #define wxHAS_CALL_AFTER #endif diff --git a/interface/wx/event.h b/interface/wx/event.h index 00b5427..f00dc12 100644 --- a/interface/wx/event.h +++ b/interface/wx/event.h @@ -527,7 +527,8 @@ public: Note that currently only up to 2 arguments can be passed. - @note This method is not available with Visual C++ 6 which doesn't + @note This method is not available with Visual C++ before version 8 + (Visual Studio 2005) as earlier versions of the compiler don't have the required support for C++ templates to implement it. @since 2.9.5 -- 2.7.4