// 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
#if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
#define wxUSE_VC_CRTDBG
#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))