From e6f3a438169a08b37494235f3000fd8ce6ea5be6 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 6 Jun 2000 15:42:51 +0000
Subject: [PATCH] Changed the code that disabled __WXDEBUG__ to only disable
 global debug new.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/defs.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index d4a7b74f56..87f846741f 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -518,9 +518,13 @@ class WXDLLEXPORT wxEvent;
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.
 #if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
-#ifndef __MWERKS__
-#undef __WXDEBUG__
-#endif
+#  ifndef __MWERKS__
+// #undef __WXDEBUG__
+#    ifdef wxUSE_DEBUG_NEW_ALWAYS
+#    undef wxUSE_DEBUG_NEW_ALWAYS
+#    define wxUSE_DEBUG_NEW_ALWAYS 0
+#    endif
+#  endif
 #endif
 
 // Callback function type definition