Added variant.h/cpp; changed variable names in object.h; added some

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 178af1fb350df4da19bdc802777de233edc0438c..de08899955124c201ca58ec216e3267bda0878fc 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -9,14 +9,15 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __OBJECTH__
-#define __OBJECTH__
+#ifndef _WX_OBJECTH__
+#define _WX_OBJECTH__

 
 #ifdef __GNUG__
 #pragma interface "object.h"
 #endif
 
 #include "wx/defs.h"
 
 #ifdef __GNUG__
 #pragma interface "object.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/memory.h"

 
 class WXDLLEXPORT wxObject;
 
 
 class WXDLLEXPORT wxObject;
 


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

-class WXDLLEXPORT ostream;
+class WXDLLIMPORT 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;

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


@@ -43,46 +46,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; }
+   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; }
+   inline wxClassInfo* GetFirst() const { return sm_first; }
+   inline wxClassInfo* GetNext() const { return m_next; }

    bool IsKindOf(wxClassInfo *info);
 
    static wxClassInfo *FindClass(char *c);
    bool IsKindOf(wxClassInfo *info);
 
    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 USE_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;\
+  static wxClassInfo sm_class##name;\

   wxClassInfo *GetClassInfo() \
   wxClassInfo *GetClassInfo() \

-   { return &name::class##name; }
+   { 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 +110,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(#name, #basename, NULL, sizeof(name), 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(#name, #basename1, #basename2, sizeof(name), 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,16 +124,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(#name, #basename, NULL, sizeof(name), NULL);
+ 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) \
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \

- wxClassInfo name::class##name(#name, #basename1, #basename2, sizeof(name), 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
 


@@ -135,7 +151,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #endif
 
 
 #endif
 

-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::class##name)
+#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__


@@ -153,12 +169,12 @@ 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) { return &sm_classwxObject; }

 
   bool IsKindOf(wxClassInfo *info);
 
 
   bool IsKindOf(wxClassInfo *info);
 


@@ -178,9 +194,9 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
   virtual void Dump(ostream& str);
 #endif
 

-#ifdef USE_STORABLE_CLASSES
-  virtual void StoreObject( wxObjectOutputStream &WXUNUSED(stream) ) {};
-  virtual void LoadObject( wxObjectInputStream &WXUNUSED(stream) ) {};
+#ifdef USE_SERIAL
+  virtual void StoreObject( wxObjectOutputStream &stream );
+  virtual void LoadObject( wxObjectInputStream &stream );

 #endif
 
   // make a 'clone' of the object
 #endif
 
   // make a 'clone' of the object


@@ -193,7 +209,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 USE_SERIAL
+  wxObject_Serialize*   m_serialObj;
+#endif

 };
 
 /*
 };
 
 /*


@@ -214,13 +233,13 @@ private:
 };
 
 #if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
 };
 
 #if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS

-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__FILE__,__LINE__)
-#endif
-#define new WXDEBUG_NEW
+//#ifndef WXDEBUG_NEW
+//#define WXDEBUG_NEW new(__FILE__,__LINE__)
+//#endif
+#define new new(__FILE__,__LINE__)

 #endif
 
 #endif
 #endif
 
 #endif

-    // __OBJECTH__
+    // _WX_OBJECTH__