Check for wxUSE_GLOBAL_MEMORY_OPERATORS before redefining new

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 55ee6b34240669df20e87748a32157bf0a21a34e..93dcda02e5725ca0996f159b5082071a15e6691b 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -37,7 +37,7 @@
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.

-#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING
+#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS

 #define new WXDEBUG_NEW
 #endif
 
 #define new WXDEBUG_NEW
 #endif