cleaning up problems after string changes

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

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 5dc0b1b027dca9c9a90386f965994a3c63a84a33..c5afed22c73b31d22ba8f6a871e57405a04ff1f9 100644 (file)
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -7,7 +7,7 @@
 // Created:     31.01.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
 // Created:     31.01.1999
 // RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // the goal of this file is to define wxCrtSetDbgFlag() macro which may be
 /////////////////////////////////////////////////////////////////////////////
 
 // the goal of this file is to define wxCrtSetDbgFlag() macro which may be


@@ -36,14 +36,11 @@
         #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
         // Need when builded with pure MS SDK
     #include <stdlib.h>
     #ifndef _CRTBLD
         // Need when builded with pure MS SDK


@@ -52,12 +49,15 @@
 
     #include <crtdbg.h>
 
 
     #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
     //
     // 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__)
+    // 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))