X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f71b0c2d56b03b7823e661aacd05cf1a791e5c2f:/include/wx/msw/msvcrt.h?ds=inline diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 5dc0b1b027..c1413a7571 100644 --- 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 -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // the goal of this file is to define wxCrtSetDbgFlag() macro which may be @@ -36,28 +36,28 @@ #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 + // Needed when building with pure MS SDK #define _CRTBLD #endif #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 + // 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))