X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c2d809a72e01f263c76ca148d0989c7350a4fc7..ebdc8341057713146d1b342434899f66acef0c12:/include/wx/msw/msvcrt.h diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 70fc382929..c5afed22c7 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -36,14 +36,11 @@ #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 #ifndef _CRTBLD // Need when builded with pure MS SDK @@ -52,12 +49,15 @@ #include + #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 // - // 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))