X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0d9d43318af6b7865f1d07cd1b64f6eafd0c54..a9d171bd008f9512f14693438af33c89ccf166a9:/include/wx/msw/msvcrt.h

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 289756e3fe..ee7db39355 100644
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -19,12 +19,14 @@
 #ifndef _MSW_MSVCRT_H_
 #define _MSW_MSVCRT_H_
 
-// use debug CRT functions for memory leak detections in VC++ if we're not
-// using wxWindows own methods
-#if defined(__WXDEBUG__) && defined(_MSC_VER) && !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__)
-    #define wxUSE_VC_CRTDBG
-#else
-    #undef wxUSE_VC_CRTDBG
+// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
+// builds
+#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__)
+        #define wxUSE_VC_CRTDBG
+    #endif
 #endif
 
 #ifdef wxUSE_VC_CRTDBG
@@ -46,4 +48,5 @@
     #define wxCrtSetDbgFlag(flag)
 #endif // wxUSE_VC_CRTDBG
 
-#endif // _MSW_MSVCRT_H_
\ No newline at end of file
+#endif // _MSW_MSVCRT_H_
+