change wxDataViewItem id to void*

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

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 0e283478d8b842afd81d3b47a0e54eddd0c6ce4b..c5afed22c73b31d22ba8f6a871e57405a04ff1f9 100644 (file)
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -22,9 +22,10 @@
 // use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
 // builds
 #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)
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \
+    && !defined(UNDER_CE)

     // it doesn't combine well with wxWin own memory debugging methods
     // 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
         #define wxUSE_VC_CRTDBG
     #endif
 #endif


@@ -35,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


@@ -51,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))