X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0d9d43318af6b7865f1d07cd1b64f6eafd0c54..4ed85025f3ba537206f70f3dd10466e16da926d4:/include/wx/msw/msvcrt.h?ds=sidebyside diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 289756e3fe..7e1e3204aa 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -7,43 +7,59 @@ // Created: 31.01.1999 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // the goal of this file is to define wxCrtSetDbgFlag() macro which may be // used like this: // wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); // to turn on memory leak checks for programs compiled with Microsoft Visual -// C++ (5.0+). The macro will expand to nothing under other compilers. +// C++ (5.0+). The macro will not be defined under other compilers or if it +// can't be used with MSVC for whatever reason. #ifndef _MSW_MSVCRT_H_ #define _MSW_MSVCRT_H_ -// use debug CRT functions for memory leak detections in VC++ if we're not -// using wxWindows own methods -#if defined(__WXDEBUG__) && defined(_MSC_VER) && !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__) - #define wxUSE_VC_CRTDBG -#else - #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(_DEBUG) && 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 + #endif #endif #ifdef wxUSE_VC_CRTDBG - // VC++ uses this macro as debug/release mode indicator - #ifndef _DEBUG - #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 + #include + #ifndef _CRTBLD + // 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/kb/q140858/ + // + // for the details + #define new WXDEBUG_NEW + #define wxCrtSetDbgFlag(flag) \ _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag)) #else // !using VC CRT #define wxCrtSetDbgFlag(flag) #endif // wxUSE_VC_CRTDBG -#endif // _MSW_MSVCRT_H_ \ No newline at end of file +#endif // _MSW_MSVCRT_H_ +