continue with other handlers if some handler fails in LoadFile() after returning...

[wxWidgets.git] / include / wx / msw / msvcrt.h

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 70fc38292982b716ffedb09d48294125da81458e..c1413a7571a65283dd700ef3fff88fc82b85a82c 100644 (file)
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -36,28 +36,28 @@
         #define _DEBUG
     #endif
 
         #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
 
     #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
     #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>
 
         #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
     //
     // 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))
 
     #define wxCrtSetDbgFlag(flag) \
         _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))