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 4b0719be5c0e81cb0a05487ba448d61d9999ba70..027d557aef7f27c53e642217bef1cee57d05cb78 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -17,10 +17,11 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/memory.h"

 
 class WXDLLEXPORT wxObject;
 
 
 class WXDLLEXPORT wxObject;
 

-#if USE_DYNAMIC_CLASSES
+#if wxUSE_DYNAMIC_CLASSES

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


@@ -29,10 +30,21 @@ class WXDLLEXPORT wxObject;
 #endif
 
 class WXDLLEXPORT wxClassInfo;
 #endif
 
 class WXDLLEXPORT wxClassInfo;

-class WXDLLEXPORT ostream;

 class WXDLLEXPORT wxInputStream;
 class WXDLLEXPORT wxInputStream;

-class WXDLLIMPORT wxObjectInputStream;
-class WXDLLIMPORT wxObjectOutputStream;
+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


@@ -43,46 +55,58 @@ typedef wxObject * (*wxObjectConstructorFn) (void);
 class WXDLLEXPORT wxClassInfo
 {
  public:
 class WXDLLEXPORT wxClassInfo
 {
  public:

-   char *className;
-   char *baseClassName1;
-   char *baseClassName2;
-   int objectSize;
-   wxObjectConstructorFn objectConstructor;
-   
-   // Pointers to base wxClassInfos: set in InitializeClasses
-   // called from wx_main.cc
-   wxClassInfo *baseInfo1;
-   wxClassInfo *baseInfo2;
-
-   static wxClassInfo *first;
-   wxClassInfo *next;
-

    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);
    
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);
    

-   inline char *GetClassName(void) const { return className; }
-   inline char *GetBaseClassName1(void) const { return baseClassName1; }
-   inline char *GetBaseClassName2(void) const { return baseClassName2; }
-   inline int GetSize(void) const { return objectSize; }
-   bool IsKindOf(wxClassInfo *info);
+   inline char *GetClassName(void) const { return m_className; }
+   inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
+   inline char *GetBaseClassName2(void) const { return m_baseClassName2; }
+   inline wxClassInfo* GetBaseClass1() const { return m_baseInfo1; }
+   inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
+   inline int GetSize(void) const { return m_objectSize; }
+   inline wxObjectConstructorFn GetConstructor() const { return m_objectConstructor; }
+   static inline wxClassInfo* GetFirst() { return sm_first; }
+   inline wxClassInfo* GetNext() const { return m_next; }
+   bool IsKindOf(wxClassInfo *info) const;

 
    static wxClassInfo *FindClass(char *c);
 
    static wxClassInfo *FindClass(char *c);

-   // Initializes parent pointers for fast searching.
+
+   // Initializes parent pointers and hash table for fast searching.

    static void InitializeClasses(void);
    static void InitializeClasses(void);

+
+   // Cleans up hash table used for fast searching.
+   static void CleanUpClasses(void);
+
+public:
+   char*                    m_className;
+   char*                    m_baseClassName1;
+   char*                    m_baseClassName2;
+   int                      m_objectSize;
+   wxObjectConstructorFn    m_objectConstructor;
+   
+   // Pointers to base wxClassInfos: set in InitializeClasses
+   // called from wx_main.cc
+   wxClassInfo*             m_baseInfo1;
+   wxClassInfo*             m_baseInfo2;
+
+   static wxClassInfo*      sm_first;
+   wxClassInfo*             m_next;
+
+   static wxHashTable*      sm_classTable;

 };
 
 };
 

-wxObject* WXDLLEXPORT wxCreateDynamicObject(char *name);
+wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);

 
 

-#ifdef USE_STORABLE_CLASSES
+#ifdef wxUSE_SERIAL

 wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \
  public:\
 wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \
  public:\

-  static wxClassInfo class##name;\
-  wxClassInfo *GetClassInfo() \
-   { return &name::class##name; }
+  static wxClassInfo sm_class##name;\
+  wxClassInfo *GetClassInfo() const \
+   { return &name::sm_class##name; }

 
 #define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 
 #define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
 #define DECLARE_CLASS(name) DECLARE_DYNAMIC_CLASS(name)


@@ -95,13 +119,13 @@ wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\

- wxClassInfo name::class##name((char *) #name, (char *) #basename, (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((char *) #name, (char *) #basename, (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\

- wxClassInfo name::class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 
 //////
 ////// for abstract classes
 
 //////
 ////// for abstract classes


@@ -109,17 +133,17 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 // Single inheritance with one base class
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
 
 // Single inheritance with one base class
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \

- wxClassInfo name::class##name((char *) #name, (char *) #basename, \
+ wxClassInfo name::sm_class##name((char *) #name, (char *) #basename, \

                 (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
                 (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \

- wxClassInfo name::class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) NULL);
+ wxClassInfo name::sm_class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) NULL);

 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

-#define CLASSINFO(name) (&name::class##name)
+#define CLASSINFO(name) (&name::sm_class##name)

 
 #else
 
 
 #else
 


@@ -136,11 +160,11 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #endif
 
 
 #endif
 

-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::class##className)
+#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)

 
 // 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>


@@ -154,19 +178,24 @@ class WXDLLEXPORT wxObject
  public:
 
   // This is equivalent to using the macro DECLARE_ABSTRACT_CLASS
  public:
 
   // This is equivalent to using the macro DECLARE_ABSTRACT_CLASS

-  static wxClassInfo classwxObject;
+  static wxClassInfo sm_classwxObject;

 
   wxObject(void);
   virtual ~wxObject(void);
 
 
   wxObject(void);
   virtual ~wxObject(void);
 

-  virtual wxClassInfo *GetClassInfo(void) { return &classwxObject; }
+  virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }

 
 

-  bool IsKindOf(wxClassInfo *info);
+  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);


@@ -175,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_STORABLE_CLASSES
+#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


@@ -194,7 +223,10 @@ class WXDLLEXPORT wxObject
   inline void SetRefData(wxObjectRefData *data) { m_refData = data; }
 
 protected:
   inline void SetRefData(wxObjectRefData *data) { m_refData = data; }
 
 protected:

-  wxObjectRefData *m_refData;
+  wxObjectRefData*      m_refData;
+#ifdef wxUSE_SERIAL
+  wxObject_Serialize*   m_serialObj;
+#endif

 };
 
 /*
 };
 
 /*


@@ -214,11 +246,11 @@ private:
     int m_count;
 };
 
     int m_count;
 };
 

-#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__FILE__,__LINE__)
-#endif
-#define new WXDEBUG_NEW
+#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
+//#ifndef WXDEBUG_NEW
+//#define WXDEBUG_NEW new(__FILE__,__LINE__)
+//#endif
+#define new new(__FILE__,__LINE__)

 #endif
 
 #endif
 #endif
 
 #endif