no message

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 9bfb34ca1dc94944cee8756794cb91dbeea03abc..6950dc80ccf1250149af7f01ee4c610dcd67dc26 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif


@@ -31,13 +31,20 @@
 #include <string.h>
 #include <assert.h>
 
 #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
 
 #include "wx/memory.h"
 #endif
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT

   // for wxObject::Dump
   // for wxObject::Dump

-  #include <iostream.h>
+#if wxUSE_IOSTREAMH
+#  include <iostream.h>
+#else
+#  include <iostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -53,7 +60,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }


@@ -61,7 +68,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
        UnRef();
 wxObject::~wxObject(void)
 {
        UnRef();

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

        if (m_serialObj)
          delete m_serialObj;
 #endif
        if (m_serialObj)
          delete m_serialObj;
 #endif


@@ -83,7 +90,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT

 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -93,7 +100,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
 }
 #endif
 

-#if WXDEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && wxUSE_MEMORY_TRACING

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -109,6 +116,14 @@ void wxObject::operator delete (void * buf)
   wxDebugFree(buf);
 }
 
   wxDebugFree(buf);
 }
 

+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator wxObject::delete(void* pData, char* /* fileName */, int /* lineNum */)
+{
+ ::operator delete(pData);
+}
+#endif
+

 // Cause problems for VC++ - crashes
 #ifndef _MSC_VER
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 // Cause problems for VC++ - crashes
 #ifndef _MSC_VER
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)


@@ -250,7 +265,7 @@ wxObject *wxCreateDynamicObject(const char *name)
     return (wxObject*) NULL;
 }
 
     return (wxObject*) NULL;
 }
 

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"