X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbc535ff084f61ec376f339c515d96d74065c18b..c030b70fc6270c2e44a81f83e69fcc91d2b3c768:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 6950dc80cc..15e3f0fec0 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -31,11 +31,11 @@
 #include <string.h>
 #include <assert.h>
 
-#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 #include "wx/memory.h"
 #endif
 
-#if WXDEBUG || wxUSE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   // for wxObject::Dump
 #if wxUSE_IOSTREAMH
 #  include <iostream.h>
@@ -90,7 +90,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return FALSE;
 }
 
-#if WXDEBUG || wxUSE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -100,7 +100,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
-#if WXDEBUG && wxUSE_MEMORY_TRACING
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
 
 #ifdef new
 #undef new
@@ -118,7 +118,7 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if _MSC_VER >= 1200
-void operator wxObject::delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
 }