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

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

diff --git a/include/wx/object.h b/include/wx/object.h
index bc9d5c480cd8717c521ddd890419a959f052519f..027d557aef7f27c53e642217bef1cee57d05cb78 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -187,7 +187,7 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info) const;
 
 
   bool IsKindOf(wxClassInfo *info) const;
 

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

   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   


@@ -204,7 +204,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
 
 #endif
 

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

   virtual void Dump(ostream& str);
 #endif
 
   virtual void Dump(ostream& str);
 #endif
 


@@ -246,7 +246,7 @@ private:
     int m_count;
 };
 
     int m_count;
 };
 

-#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS

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