diff --git a/include/wx/event.h b/include/wx/event.h
index 99710b7d7c..6e4805549c 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 00b5427ba1..f00dc12b0f 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