Win16 corrections

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index ffe51a481c3a5566261932dcb6287cf2f20eb482..a335a1dfcc3e9fa40aec34e14069b882b18f47ca 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
@@ -23,20 +23,33 @@ class WXDLLEXPORT wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__
 #ifdef GetClassName
 #undef GetClassName
 #endif
+#ifdef GetClassInfo
+#undef GetClassInfo
 #endif
+// #endif
 
 class WXDLLEXPORT wxClassInfo;
-class WXDLLIMPORT ostream;
 class WXDLLEXPORT wxInputStream;
+class WXDLLEXPORT wxOutputStream;
 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>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif
+#endif
+
 /*
  * Dynamic object system declarations
  */
@@ -49,7 +62,7 @@ class WXDLLEXPORT wxClassInfo
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);
-   
+
    inline char *GetClassName(void) const { return m_className; }
    inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
    inline char *GetBaseClassName2(void) const { return m_baseClassName2; }
@@ -75,7 +88,7 @@ public:
    char*                    m_baseClassName2;
    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;
-   
+
    // Pointers to base wxClassInfos: set in InitializeClasses
    // called from wx_main.cc
    wxClassInfo*             m_baseInfo1;
@@ -87,10 +100,10 @@ public:
    static wxHashTable*      sm_classTable;
 };
 
-wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
+WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
-#ifdef wxUSE_SERIAL
-wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
+#if wxUSE_SERIAL
+WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \
@@ -151,7 +164,10 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #endif
 
-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+
+// Just seems a bit nicer-looking (pretend it's not a macro)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__
@@ -178,28 +194,33 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info) const;
 
-#if WXDEBUG && wxUSE_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);
-  
+
 // VC++ 6.0
-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
   void operator delete(void *buf, char*, int);
 #endif
 
-  // Cause problems for VC++
-#ifndef _MSC_VER
+    // Causes problems for VC++
+#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 
+#ifdef __MWERKS__
+  void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
+  void operator delete[] (void * buf);
 #endif
 
-#if WXDEBUG || wxUSE_DEBUG_CONTEXT
+#endif // Debug & memory tracing
+
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
@@ -215,7 +236,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   wxObject_Serialize*   m_serialObj;
 #endif
 };
@@ -237,10 +258,19 @@ private:
     int m_count;
 };
 
-#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
-//#ifndef WXDEBUG_NEW
-//#define WXDEBUG_NEW new(__FILE__,__LINE__)
-//#endif
+#ifdef __WXDEBUG__
+#ifndef WXDEBUG_NEW
+#define WXDEBUG_NEW new(__FILE__,__LINE__)
+#endif
+#else
+#define WXDEBUG_NEW new
+#endif
+
+// Redefine new to be the debugging version. This doesn't
+// work with all compilers, in which case you need to
+// use WXDEBUG_NEW explicitly if you wish to use the debugging version.
+
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
 #define new new(__FILE__,__LINE__)
 #endif