wxUSE_VC_CRTDBG needs to be dependent on wxUSE_MEMORY_TRACING too

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 0e283478d8b842afd81d3b47a0e54eddd0c6ce4b..5e757840a44e5291dfdad1497ef3b71296cf1980 100644 (file)
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -24,7 +24,7 @@
 #undef wxUSE_VC_CRTDBG
 #if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000)
     // it doesn't combine well with wxWin own memory debugging methods
-    #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__)
+    #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
         #define wxUSE_VC_CRTDBG
     #endif
 #endif