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 319022cdfe519ee4bfc10290a94838de7725ed9a..027d557aef7f27c53e642217bef1cee57d05cb78 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -21,7 +21,7 @@
 
 class WXDLLEXPORT wxObject;
 
 
 class WXDLLEXPORT wxObject;
 

-#if USE_DYNAMIC_CLASSES
+#if wxUSE_DYNAMIC_CLASSES

 
 #ifdef __GNUWIN32__
 #ifdef GetClassName
 
 #ifdef __GNUWIN32__
 #ifdef GetClassName


@@ -30,13 +30,22 @@ class WXDLLEXPORT wxObject;
 #endif
 
 class WXDLLEXPORT wxClassInfo;
 #endif
 
 class WXDLLEXPORT wxClassInfo;

-class WXDLLIMPORT ostream;

 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxObjectInputStream;
 class WXDLLEXPORT wxObjectOutputStream;
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 
 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxObjectInputStream;
 class WXDLLEXPORT wxObjectOutputStream;
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 

+#if wxUSE_IOSTREAMH
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>
+#else
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif
+#endif
+

 /*
  * Dynamic object system declarations
  */
 /*
  * Dynamic object system declarations
  */


@@ -57,7 +66,7 @@ class WXDLLEXPORT wxClassInfo
    inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
    inline int GetSize(void) const { return m_objectSize; }
    inline wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }
    inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
    inline int GetSize(void) const { return m_objectSize; }
    inline wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }

-   inline wxClassInfo* GetFirst() const { return sm_first; }
+   static inline wxClassInfo* GetFirst() { return sm_first; }

    inline wxClassInfo* GetNext() const { return m_next; }
    bool IsKindOf(wxClassInfo *info) const;
 
    inline wxClassInfo* GetNext() const { return m_next; }
    bool IsKindOf(wxClassInfo *info) const;
 


@@ -89,7 +98,7 @@ public:
 
 wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
 
 
 wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
 

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

 wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #endif
 


@@ -155,7 +164,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #else
 #include <iostream>
 #include <iostream.h>
 #else
 #include <iostream>


@@ -178,10 +187,15 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info) const;
 
 
   bool IsKindOf(wxClassInfo *info) const;
 

-#if WXDEBUG && USE_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);
   

+// VC++ 6.0
+#if _MSC_VER >= 1200
+  void operator delete(void *buf, char*, int);
+#endif
+

   // Cause problems for VC++
 #ifndef _MSC_VER
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   // Cause problems for VC++
 #ifndef _MSC_VER
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);


@@ -190,11 +204,11 @@ class WXDLLEXPORT wxObject
 
 #endif
 
 
 #endif
 

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

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

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif


@@ -210,7 +224,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
 
 protected:
   wxObjectRefData*      m_refData;

-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL

   wxObject_Serialize*   m_serialObj;
 #endif
 };
   wxObject_Serialize*   m_serialObj;
 #endif
 };


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

-#if WXDEBUG && USE_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