Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 4a4117e410b4ce97044673203fe69dc10700de67..0afeaf4ebdeefdd2efa6c43aef3dad6d565d705f 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
   info, or to be a straight call to the new operator.
 */
 

-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 


@@ -39,7 +39,7 @@
 
 #include "wx/string.h"
 
 
 #include "wx/string.h"
 

-#if WXDEBUG
+#ifdef __WXDEBUG__

 
 // #ifndef WXDEBUG_NEW
 // #define WXDEBUG_NEW new(__FILE__,__LINE__)
 
 // #ifndef WXDEBUG_NEW
 // #define WXDEBUG_NEW new(__FILE__,__LINE__)


@@ -280,7 +280,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 // #define WXDEBUG_NEW new
 
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 // #define WXDEBUG_NEW new
 

-#endif // WXDEBUG
+#endif // __WXDEBUG__

 
 #endif
     // _WX_MEMORYH__
 
 #endif
     // _WX_MEMORYH__