projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...
[wxWidgets.git]
/
include
/
wx
/
msw
/
msvcrt.h
diff --git
a/include/wx/msw/msvcrt.h
b/include/wx/msw/msvcrt.h
index cb6f1593c56eaf5baff7da9be8327667afd5d0f9..0b08fc2f12a7b21544055b8749f8ab730a80ac30 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,13
+36,26
@@
#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
+ #include <stdlib.h>
+ #ifndef _CRTBLD
+ // Need when builded with pure MS SDK
+ #define _CRTBLD
+ #endif
+
#include <crtdbg.h>
#include <crtdbg.h>
+ // 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__)
+
#define wxCrtSetDbgFlag(flag) \
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))
#else // !using VC CRT
#define wxCrtSetDbgFlag(flag) \
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | (flag))
#else // !using VC CRT