Fixes for Unicode build.

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 1a2a2c8038de3915f03c6d27e71196ff3858124d..1443bcfa938280c580db7e2b24adf9a1b32bb6eb 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,7 +13,7 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "object.h"
 #endif
 
 #pragma interface "object.h"
 #endif
 


@@ -28,6 +28,14 @@ class WXDLLIMPEXP_BASE wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
 
 #if wxUSE_DYNAMIC_CLASSES
 

+#ifndef wxUSE_EXTENDED_RTTI
+#define wxUSE_EXTENDED_RTTI 0
+#endif
+
+#if wxUSE_EXTENDED_RTTI
+#include "wx/xti.h"
+#else
+

 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------


@@ -55,27 +63,30 @@ class WXDLLIMPEXP_BASE wxClassInfo
 {
 public:
     wxClassInfo( const wxChar *className,
 {
 public:
     wxClassInfo( const wxChar *className,

-                 const wxChar *baseName1,
-                 const wxChar *baseName2,
+                 const wxClassInfo *baseInfo1,
+                 const wxClassInfo *baseInfo2,

                  int size,
                  wxObjectConstructorFn ctor )
         : m_className(className)
                  int size,
                  wxObjectConstructorFn ctor )
         : m_className(className)

-        , m_baseClassName1(baseName1)
-        , m_baseClassName2(baseName2)

         , m_objectSize(size)
         , m_objectConstructor(ctor)
         , m_objectSize(size)
         , m_objectConstructor(ctor)

-        , m_baseInfo1(0)
-        , m_baseInfo2(0)
+        , m_baseInfo1(baseInfo1)
+        , m_baseInfo2(baseInfo2)

         , m_next(sm_first)
         , m_next(sm_first)

-        { sm_first = this; }
+        { 
+            sm_first = this;
+            Register();
+        }

 
     ~wxClassInfo();
 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
     const wxChar       *GetClassName() const { return m_className; }
 
     ~wxClassInfo();
 
     wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
 
     const wxChar       *GetClassName() const { return m_className; }

-    const wxChar       *GetBaseClassName1() const { return m_baseClassName1; }
-    const wxChar       *GetBaseClassName2() const { return m_baseClassName2; }
+    const wxChar       *GetBaseClassName1() const
+        { return m_baseInfo1 ? m_baseInfo1->GetClassName() : NULL; }
+    const wxChar       *GetBaseClassName2() const
+        { return m_baseInfo2 ? m_baseInfo2->GetClassName() : NULL; }

     const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
     const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
     int                 GetSize() const { return m_objectSize; }
     const wxClassInfo  *GetBaseClass1() const { return m_baseInfo1; }
     const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
     int                 GetSize() const { return m_objectSize; }


@@ -96,18 +107,16 @@ public:
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 

-        // Initializes parent pointers and hash table for fast searching.
-
-    static void     InitializeClasses();
-
-        // Cleans up hash table used for fast searching.
-
-    static void     CleanUpClasses();
-
+#if WXWIN_COMPATIBILITY_2_4
+    // Initializes parent pointers and hash table for fast searching.
+    wxDEPRECATED( static void InitializeClasses() );
+    // Cleans up hash table used for fast searching.
+    wxDEPRECATED( static void CleanUpClasses() );
+#endif
+    static void     CleanUp();
+    

 public:
     const wxChar            *m_className;
 public:
     const wxChar            *m_className;

-    const wxChar            *m_baseClassName1;
-    const wxChar            *m_baseClassName2;

     int                      m_objectSize;
     wxObjectConstructorFn    m_objectConstructor;
 
     int                      m_objectSize;
     wxObjectConstructorFn    m_objectConstructor;
 


@@ -131,19 +140,30 @@ private:
     static wxClassInfo *GetBaseByName(const wxChar *name);
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)
     static wxClassInfo *GetBaseByName(const wxChar *name);
 
     DECLARE_NO_COPY_CLASS(wxClassInfo)

+   
+protected: 
+    // registers the class
+    void Register();
+    void Unregister();

 };
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 
 };
 
 WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
 

+#if WXWIN_COMPATIBILITY_2_4
+inline void wxClassInfo::InitializeClasses() {}
+inline void wxClassInfo::CleanUpClasses() {}
+#endif
+

 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 
 #define DECLARE_DYNAMIC_CLASS(name)           \
  public:                                      \
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 
 #define DECLARE_DYNAMIC_CLASS(name)           \
  public:                                      \

-  static wxClassInfo sm_class##name;          \
+  static wxClassInfo ms_classInfo;            \
+  static wxObject* wxCreateObject();          \

   virtual wxClassInfo *GetClassInfo() const   \
   virtual wxClassInfo *GetClassInfo() const   \

-   { return &name::sm_class##name; }
+   { return &name::ms_classInfo; }

 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     DECLARE_NO_ASSIGN_CLASS(name)               \
 
 #define DECLARE_DYNAMIC_CLASS_NO_ASSIGN(name)   \
     DECLARE_NO_ASSIGN_CLASS(name)               \


@@ -163,20 +183,23 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
     // Single inheritance with one base class
 
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \

- wxObject* wxConstructorFor##name()                             \
+ wxObject* name::wxCreateObject()                             \

   { return new name; }                                          \
   { return new name; }                                          \

- wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename),   \
-            0, (int) sizeof(name),                              \
-            (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
+            (int) sizeof(name),                                 \
+            (wxObjectConstructorFn) name::wxCreateObject);

 
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
 
     // Multiple inheritance with two base classes
 
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \

- wxObject* wxConstructorFor##name()                             \
+ wxObject* name::wxCreateObject()                             \

   { return new name; }                                          \
   { return new name; }                                          \

- wxClassInfo name::sm_class##name(wxT(#name), wxT(#basename1),  \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \

             wxT(#basename2), (int) sizeof(name),                \
             wxT(#basename2), (int) sizeof(name),                \

-            (wxObjectConstructorFn) wxConstructorFor##name);
+            (wxObjectConstructorFn) name::wxCreateObject);

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


@@ -185,19 +208,25 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
     // 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::sm_class##name(wxT(#name), wxT(#basename),   \
-            0, (int) sizeof(name), (wxObjectConstructorFn) 0);
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename::ms_classInfo, NULL,                      \
+            (int) sizeof(name), (wxObjectConstructorFn) 0);

 
     // 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::sm_class##name(wxT(#name), wxT(#basename1),  \
-            wxT(#basename2), (int) sizeof(name),                \
+ wxClassInfo name::ms_classInfo(wxT(#name),                     \
+            &basename1::ms_classInfo,                           \
+            &basename2::ms_classInfo,                           \
+            (int) sizeof(name),                                 \

             (wxObjectConstructorFn) 0);
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
             (wxObjectConstructorFn) 0);
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

+#endif // !wxUSE_EXTENDED_RTTI
+
+

 // -----------------------------------
 // for pluggable classes
 // -----------------------------------
 // -----------------------------------
 // for pluggable classes
 // -----------------------------------


@@ -265,8 +294,7 @@ name##PluginSentinel  m_pluginsentinel;
 #define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
  IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
 
 #define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)  \
  IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
 

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

 
 #else // !wxUSE_DYNAMIC_CLASSES
 
 
 #else // !wxUSE_DYNAMIC_CLASSES
 


@@ -298,35 +326,31 @@ name##PluginSentinel  m_pluginsentinel;
 
 #endif // wxUSE_DYNAMIC_CLASSES
 
 
 #endif // wxUSE_DYNAMIC_CLASSES
 

-
-#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::ms_classInfo)

 
 // Just seems a bit nicer-looking (pretend it's not a macro)
 
 // Just seems a bit nicer-looking (pretend it's not a macro)

-#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::ms_classInfo)

 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \
 
 // to be replaced by dynamic_cast<> in the future
 #define wxDynamicCast(obj, className) \

- ((className *) wxCheckDynamicCast((wxObject*)(obj), &className::sm_class##className))
+    ((className *) wxCheckDynamicCast( \
+        wx_const_cast(wxObject *, wx_static_cast(const wxObject *, \
+          wx_const_cast(className *, wx_static_cast(const className *, obj)))), \
+        &className::ms_classInfo))

 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
 #define wxDynamicCastThis(className) \
 
 // The 'this' pointer is always true, so use this version
 // to cast the this pointer and avoid compiler warnings.
 #define wxDynamicCastThis(className) \

- (IsKindOf(&className::sm_class##className) ? (className *)(this) : (className *)0)
-
-#ifdef HAVE_CONST_CAST
-#define wxConstCast(obj, className) const_cast<className *>(obj)
-#else
-#define wxConstCast(obj, className) ((className *)(obj))
-#endif
-
+ (IsKindOf(&className::ms_classInfo) ? (className *)(this) : (className *)0)

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-inline void wxCheckCast(void *ptr)
+inline void* wxCheckCast(void *ptr)

 {
     wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
 {
     wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );

+    return ptr;

 }
 #define wxStaticCast(obj, className) \
 }
 #define wxStaticCast(obj, className) \

- (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+ ((className *)wxCheckCast(wxDynamicCast(obj, className)))

 
 #else  // !__WXDEBUG__
 #define wxStaticCast(obj, className) ((className *)(obj))
 
 #else  // !__WXDEBUG__
 #define wxStaticCast(obj, className) ((className *)(obj))


@@ -391,13 +415,8 @@ inline void wxCheckCast(void *ptr)
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 
 
 #endif // WXDEBUG && wxUSE_MEMORY_TRACING
 

-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-// needed by wxObject::Dump
-#include "wx/iosfwrap.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxObject: the root class of wxWindows object hierarchy
+// wxObject: the root class of wxWidgets object hierarchy

 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject
 // ----------------------------------------------------------------------------
 
 class WXDLLIMPEXP_BASE wxObject


@@ -406,16 +425,16 @@ class WXDLLIMPEXP_BASE wxObject
 
 private:
     void InitFrom(const wxObject& other);
 
 private:
     void InitFrom(const wxObject& other);

-    
+

 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }
 public:
     wxObject() { m_refData = NULL; }
     virtual ~wxObject() { UnRef(); }

-    
+

     wxObject(const wxObject& other)
         {
             InitFrom(other);
         }
     wxObject(const wxObject& other)
         {
             InitFrom(other);
         }

-    
+

     wxObject& operator=(const wxObject& other)
     {
         if ( this != &other )
     wxObject& operator=(const wxObject& other)
     {
         if ( this != &other )


@@ -459,11 +478,6 @@ public:
     void operator delete[] (void* buf, const wxChar*, int );
 #endif
 
     void operator delete[] (void* buf, const wxChar*, int );
 #endif
 

-
-#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
-    virtual void Dump(wxSTD ostream& str);
-#endif
-

     // ref counted data handling methods
 
     // get/set
     // ref counted data handling methods
 
     // get/set


@@ -518,6 +532,42 @@ inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
 }
 
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
 }
 

+#if wxUSE_EXTENDED_RTTI
+class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
+{
+    friend class WXDLLIMPEXP_BASE wxDynamicClassInfo ;
+public:
+    // instantiates this object with an instance of its superclass
+    wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
+    ~wxDynamicObject();
+
+    void SetProperty (const wxChar *propertyName, const wxxVariant &value);
+    wxxVariant GetProperty (const wxChar *propertyName) const ;
+
+    // get the runtime identity of this object
+    wxClassInfo *GetClassInfo() const
+    {
+               return wx_const_cast(wxClassInfo *, m_classInfo);
+    }
+
+    wxObject* GetSuperClassInstance() const
+    {
+        return m_superClassInstance ;
+    }
+private :
+    // removes an existing runtime-property
+    void RemoveProperty( const wxChar *propertyName ) ;
+
+    // renames an existing runtime-property
+    void RenameProperty( const wxChar *oldPropertyName , const wxChar *newPropertyName ) ;
+
+    wxObject *m_superClassInstance ;
+    const wxDynamicClassInfo *m_classInfo;
+    struct wxDynamicObjectInternal;
+    wxDynamicObjectInternal *m_data;
+};
+#endif
+

 // ----------------------------------------------------------------------------
 // more debugging macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // more debugging macros
 // ----------------------------------------------------------------------------