X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7d40f0a500faebf846c99b992088b17e65c7d4e8:/include/wx/msw/msvcrt.h

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 70fc382929..7e1e3204aa 100644
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -14,7 +14,8 @@
 // used like this:
 //      wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
 // to turn on memory leak checks for programs compiled with Microsoft Visual
-// C++ (5.0+). The macro will expand to nothing under other compilers.
+// C++ (5.0+). The macro will not be defined under other compilers or if it
+// can't be used with MSVC for whatever reason.
 
 #ifndef _MSW_MSVCRT_H_
 #define _MSW_MSVCRT_H_
@@ -22,7 +23,7 @@
 // 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) \
+#if defined(_DEBUG) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \
     && !defined(UNDER_CE)
     // it doesn't combine well with wxWin own memory debugging methods
     #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
@@ -31,33 +32,28 @@
 #endif
 
 #ifdef wxUSE_VC_CRTDBG
-    // VC++ uses this macro as debug/release mode indicator
-    #ifndef _DEBUG
-        #define _DEBUG
-    #endif
-
-    // Need to undef new if including crtdbg.h which redefines new itself
+    // Need to undef new if including crtdbg.h which may redefine new itself
     #ifdef new
         #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
+        // Needed when building with pure MS SDK
         #define _CRTBLD
     #endif
 
     #include <crtdbg.h>
 
+    #undef WXDEBUG_NEW
+    #define WXDEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+
     // this define works around a bug with inline declarations of new, see
     //
-    //      http://support.microsoft.com/support/kb/articles/Q140/8/58.asp
+    //      http://support.microsoft.com/kb/q140858/
     //
-    // for the details 
-    #define new  new( _NORMAL_BLOCK, __FILE__, __LINE__)
+    // for the details
+    #define new  WXDEBUG_NEW
 
     #define wxCrtSetDbgFlag(flag) \
         _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))