X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/794df945d5331a7ea8e3d44bdccd53c36963957b..ad813b00d5956f35f2b1585a276095e24ce8ad5a:/src/common/object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 0eda4f7880..734a4d5085 100644
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
-    #ifdef wxUSE_SERIAL
+    #if wxUSE_SERIAL
         #include "wx/objstrm.h"
         #include "wx/serbase.h"
 
@@ -40,15 +40,8 @@
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
-  // for wxObject::Dump
-#if wxUSE_IOSTREAMH
-#  include <iostream.h>
-#else
-#  include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+    // for wxObject::Dump
+    #include "wx/ioswrap.h"
 #endif
 
 #if !USE_SHARED_LIBRARY
@@ -64,7 +57,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
@@ -72,7 +65,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
 	UnRef();
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 	if (m_serialObj)
 	  delete m_serialObj;
 #endif
@@ -121,7 +114,7 @@ void wxObject::operator delete (void * buf)
 }
 
 // VC++ 6.0
-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
@@ -129,7 +122,7 @@ void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum
 #endif
 
 // Cause problems for VC++ - crashes
-#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
+#if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 {
   return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
@@ -269,7 +262,7 @@ wxObject *wxCreateDynamicObject(const char *name)
     return (wxObject*) NULL;
 }
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"
@@ -327,7 +320,7 @@ void wxObject::LoadObject( wxObjectInputStream& stream )
   m_serialObj->LoadObject(stream);
 }
 
-#endif
+#endif // wxUSE_SERIAL
 
 /*
  * wxObject: cloning of objects