X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..2d73b710e1fb5d1e99b4bdbcbdbf301d3bce1bc2:/include/wx/msw/msvcrt.h

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index cb6f1593c5..5e757840a4 100644
--- 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
@@ -40,8 +40,24 @@
         #undef new
     #endif
 
+    // we need this to show file & line number of the allocation that caused
+    // the leak
+    #define _CRTDBG_MAP_ALLOC
+    #include <stdlib.h>
+    #ifndef _CRTBLD
+        // Need when builded with pure MS SDK
+        #define _CRTBLD
+    #endif
+
     #include <crtdbg.h>
 
+    // this define works around a bug with inline declarations of new, see
+    //
+    //      http://support.microsoft.com/support/kb/articles/Q140/8/58.asp
+    //
+    // for the details 
+    #define new  new( _NORMAL_BLOCK, __FILE__, __LINE__)
+
     #define wxCrtSetDbgFlag(flag) \
         _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))
 #else // !using VC CRT