odbc off by default

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 52d95152bb2c1b2f67e6fb25d8555eac548f2206..d26826ebe253cafe90d60334d53445afacf1b774 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
@@ -31,11 +31,11 @@
 #include <string.h>
 #include <assert.h>
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 #include "wx/memory.h"
 #endif
 
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT
   // for wxObject::Dump
   #include <iostream.h>
 #endif
@@ -53,7 +53,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
@@ -61,7 +61,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
        UnRef();
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
        if (m_serialObj)
          delete m_serialObj;
 #endif
@@ -83,7 +83,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return FALSE;
 }
 
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -93,7 +93,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
-#if WXDEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && wxUSE_MEMORY_TRACING
 
 #ifdef new
 #undef new
@@ -111,7 +111,7 @@ void wxObject::operator delete (void * buf)
 
 // VC++ 6.0
 #if _MSC_VER >= 1200
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void operator wxObject::delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
 }
@@ -258,7 +258,7 @@ wxObject *wxCreateDynamicObject(const char *name)
     return (wxObject*) NULL;
 }
 
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"