fix comparison of BYTE variable with -1 after last commit

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

diff --git a/include/wx/object.h b/include/wx/object.h
index b065d9d92baf6de341846c0b5f1ba438cabd297b..e24fc89e1c3a000468383475bf32a7a95a024623 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,25 +13,50 @@
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 
 #ifndef _WX_OBJECTH__
 #define _WX_OBJECTH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "object.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/defs.h"

 #include "wx/memory.h"
 
 #include "wx/memory.h"
 

-class WXDLLIMPEXP_BASE wxObject;
-
-#if wxUSE_DYNAMIC_CLASSES
+class WXDLLIMPEXP_FWD_BASE wxObject;
+class WXDLLIMPEXP_FWD_BASE wxString;

 
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
 
 
 #ifndef wxUSE_EXTENDED_RTTI
 #define wxUSE_EXTENDED_RTTI 0
 #endif
 

+#define DECLARE_CLASS_INFO_ITERATORS()                                       \
+    class WXDLLIMPEXP_BASE const_iterator                                    \
+    {                                                                        \
+        typedef wxHashTable_Node Node;                                       \
+    public:                                                                  \
+        typedef const wxClassInfo* value_type;                               \
+        typedef const value_type& const_reference;                           \
+        typedef const_iterator itor;                                         \
+        typedef value_type* ptr_type;                                        \
+                                                                             \
+        Node* m_node;                                                        \
+        wxHashTable* m_table;                                                \
+    public:                                                                  \
+        typedef const_reference reference_type;                              \
+        typedef ptr_type pointer_type;                                       \
+                                                                             \
+        const_iterator(Node* node, wxHashTable* table)                       \
+            : m_node(node), m_table(table) { }                               \
+        const_iterator() : m_node(NULL), m_table(NULL) { }                   \
+        value_type operator*() const;                                        \
+        itor& operator++();                                                  \
+        const itor operator++(int);                                          \
+        bool operator!=(const itor& it) const                                \
+            { return it.m_node != m_node; }                                  \
+        bool operator==(const itor& it) const                                \
+            { return it.m_node == m_node; }                                  \
+    };                                                                       \
+                                                                             \
+    static const_iterator begin_classinfo();                                 \
+    static const_iterator end_classinfo();
+

 #if wxUSE_EXTENDED_RTTI
 #include "wx/xti.h"
 #else
 #if wxUSE_EXTENDED_RTTI
 #include "wx/xti.h"
 #else


@@ -40,18 +65,12 @@ class WXDLLIMPEXP_BASE wxObject;
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-// this shouldn't be needed any longer as <wx/msw/private.h> does it but it
-// doesn't hurt neither
-#ifdef GetClassName
-#undef GetClassName
-#endif
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-class WXDLLIMPEXP_BASE wxClassInfo;
-class WXDLLIMPEXP_BASE wxHashTable;
-class WXDLLIMPEXP_BASE wxObjectRefData;
+class WXDLLIMPEXP_FWD_BASE wxClassInfo;
+class WXDLLIMPEXP_FWD_BASE wxHashTable;
+class WXDLLIMPEXP_FWD_BASE wxObject;
+class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
+class WXDLLIMPEXP_FWD_BASE wxObjectRefData;
+class WXDLLIMPEXP_FWD_BASE wxHashTable_Node;

 
 // ----------------------------------------------------------------------------
 // wxClassInfo
 
 // ----------------------------------------------------------------------------
 // wxClassInfo


@@ -61,6 +80,8 @@ typedef wxObject *(*wxObjectConstructorFn)(void);
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {
 
 class WXDLLIMPEXP_BASE wxClassInfo
 {

+    friend class WXDLLIMPEXP_FWD_BASE wxObject;
+    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);

 public:
     wxClassInfo( const wxChar *className,
                  const wxClassInfo *baseInfo1,
 public:
     wxClassInfo( const wxChar *className,
                  const wxClassInfo *baseInfo1,


@@ -73,14 +94,16 @@ public:
         , m_baseInfo1(baseInfo1)
         , m_baseInfo2(baseInfo2)
         , m_next(sm_first)
         , m_baseInfo1(baseInfo1)
         , m_baseInfo2(baseInfo2)
         , m_next(sm_first)

-        { 
+        {

             sm_first = this;
             Register();
         }
 
     ~wxClassInfo();
 
             sm_first = this;
             Register();
         }
 
     ~wxClassInfo();
 

-    wxObject *CreateObject() { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    wxObject *CreateObject() const
+        { return m_objectConstructor ? (*m_objectConstructor)() : 0; }
+    bool IsDynamic() const { return (NULL != m_objectConstructor); }

 
     const wxChar       *GetClassName() const { return m_className; }
     const wxChar       *GetBaseClassName1() const
 
     const wxChar       *GetClassName() const { return m_className; }
     const wxChar       *GetBaseClassName1() const


@@ -91,10 +114,11 @@ public:
     const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
     int                 GetSize() const { return m_objectSize; }
 
     const wxClassInfo  *GetBaseClass2() const { return m_baseInfo2; }
     int                 GetSize() const { return m_objectSize; }
 

-    wxObjectConstructorFn      GetConstructor() const { return m_objectConstructor; }
+    wxObjectConstructorFn      GetConstructor() const
+        { return m_objectConstructor; }

     static const wxClassInfo  *GetFirst() { return sm_first; }
     const wxClassInfo         *GetNext() const { return m_next; }
     static const wxClassInfo  *GetFirst() { return sm_first; }
     const wxClassInfo         *GetNext() const { return m_next; }

-    static wxClassInfo        *FindClass(const wxChar *className);
+    static wxClassInfo        *FindClass(const wxString& className);

 
         // Climb upwards through inheritance hierarchy.
         // Dual inheritance is catered for.
 
         // Climb upwards through inheritance hierarchy.
         // Dual inheritance is catered for.


@@ -107,20 +131,13 @@ public:
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 
                  ( m_baseInfo2 && m_baseInfo2->IsKindOf(info) ) );
     }
 

-#ifdef 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:
+    DECLARE_CLASS_INFO_ITERATORS()
+private:

     const wxChar            *m_className;
     int                      m_objectSize;
     wxObjectConstructorFn    m_objectConstructor;
 
     const wxChar            *m_className;
     int                      m_objectSize;
     wxObjectConstructorFn    m_objectConstructor;
 

-        // Pointers to base wxClassInfos: set in InitializeClasses
+        // Pointers to base wxClassInfos

 
     const wxClassInfo       *m_baseInfo1;
     const wxClassInfo       *m_baseInfo2;
 
     const wxClassInfo       *m_baseInfo1;
     const wxClassInfo       *m_baseInfo2;


@@ -131,74 +148,75 @@ public:
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 

-    // FIXME: this should be private (currently used directly by way too
-    //        many clients)

     static wxHashTable      *sm_classTable;
 
     static wxHashTable      *sm_classTable;
 

-private:
-    // InitializeClasses() helper
-    static wxClassInfo *GetBaseByName(const wxChar *name);
-
-    DECLARE_NO_COPY_CLASS(wxClassInfo)
-   
-protected: 
+protected:

     // registers the class
     void Register();
     void Unregister();
     // registers the class
     void Register();
     void Unregister();

-};

 
 

-WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);
+    DECLARE_NO_COPY_CLASS(wxClassInfo)
+};

 
 

-#ifdef WXWIN_COMPATIBILITY_2_4
-inline void wxClassInfo::InitializeClasses() {}
-inline void wxClassInfo::CleanUpClasses() {}
-#endif
+WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);

 
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 

-#define DECLARE_DYNAMIC_CLASS(name)           \
- public:                                      \
-  static wxClassInfo sm_class##name;          \
-  virtual wxClassInfo *GetClassInfo() const   \
-   { return &name::sm_class##name; }
+#define DECLARE_ABSTRACT_CLASS(name)                                          \
+    public:                                                                   \
+        static wxClassInfo ms_classInfo;                                      \
+        virtual wxClassInfo *GetClassInfo() const;

 
 

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

     DECLARE_DYNAMIC_CLASS(name)
 
     DECLARE_DYNAMIC_CLASS(name)
 

-#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)   \
-    DECLARE_NO_COPY_CLASS(name)               \
+#define DECLARE_DYNAMIC_CLASS_NO_COPY(name)                                   \
+    DECLARE_NO_COPY_CLASS(name)                                               \

     DECLARE_DYNAMIC_CLASS(name)
 
     DECLARE_DYNAMIC_CLASS(name)
 

-#define DECLARE_ABSTRACT_CLASS(name) DECLARE_DYNAMIC_CLASS(name)
+#define DECLARE_DYNAMIC_CLASS(name)                                           \
+    DECLARE_ABSTRACT_CLASS(name)                                              \
+    static wxObject* wxCreateObject();
+

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

+
+// common part of the macros below
+#define wxIMPLEMENT_CLASS_COMMON(name, basename, baseclsinfo2, func)          \
+    wxClassInfo name::ms_classInfo(wxT(#name),                                \
+            &basename::ms_classInfo,                                          \
+            baseclsinfo2,                                                     \
+            (int) sizeof(name),                                               \
+            (wxObjectConstructorFn) func);                                    \
+                                                                              \
+    wxClassInfo *name::GetClassInfo() const                                   \
+        { return &name::ms_classInfo; }
+
+#define wxIMPLEMENT_CLASS_COMMON1(name, basename, func)                       \
+    wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
+
+#define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
+    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)
+

 // -----------------------------------
 // for concrete classes
 // -----------------------------------
 
     // Single inheritance with one base class
 // -----------------------------------
 // for concrete classes
 // -----------------------------------
 
     // Single inheritance with one base class

-
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename)                 \
- wxObject* wxConstructorFor##name()                             \
-  { return new name; }                                          \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename::sm_class##basename, NULL,                \
-            (int) sizeof(name),                                 \
-            (wxObjectConstructorFn) wxConstructorFor##name);
+#define IMPLEMENT_DYNAMIC_CLASS(name, basename)                               \
+    wxIMPLEMENT_CLASS_COMMON1(name, basename, name::wxCreateObject)           \
+    wxObject* name::wxCreateObject()                                          \
+        { return new name; }

 
     // Multiple inheritance with two base classes
 
     // Multiple inheritance with two base classes

-
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)    \
- wxObject* wxConstructorFor##name()                             \
-  { return new name; }                                          \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename1::sm_class##basename1,                    \
-            &basename2::sm_class##basename2,                    \
-            wxT(#basename2), (int) sizeof(name),                \
-            (wxObjectConstructorFn) wxConstructorFor##name);
+#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)                  \
+    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2,                     \
+                              name::wxCreateObject)                           \
+    wxObject* name::wxCreateObject()                                          \
+        { return new name; }

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


@@ -206,19 +224,13 @@ inline void wxClassInfo::CleanUpClasses() {}
 
     // Single inheritance with one base class
 
 
     // Single inheritance with one base class
 

-#define IMPLEMENT_ABSTRACT_CLASS(name, basename)                \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename::sm_class##basename, NULL,                \
-            (int) sizeof(name), (wxObjectConstructorFn) 0);
+#define IMPLEMENT_ABSTRACT_CLASS(name, basename)                              \
+    wxIMPLEMENT_CLASS_COMMON1(name, basename, NULL)

 
     // Multiple inheritance with two base classes
 
 
     // Multiple inheritance with two base classes
 

-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)   \
- wxClassInfo name::sm_class##name(wxT(#name),                   \
-            &basename1::sm_class##basename1,                    \
-            &basename2::sm_class##basename2,                    \
-            (int) sizeof(name),                                 \
-            (wxObjectConstructorFn) 0);
+#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)                 \
+    wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, 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


@@ -293,69 +305,41 @@ 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)
-
-#else // !wxUSE_DYNAMIC_CLASSES
-
-    // No dynamic class system: so stub out the macros
-
-#define DECLARE_DYNAMIC_CLASS(name)
-#define DECLARE_ABSTRACT_CLASS(name)
-#define DECLARE_CLASS(name)
-#define IMPLEMENT_DYNAMIC_CLASS(name, basename)
-#define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
-#define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
-
-#define DECLARE_PLUGGABLE_CLASS(name)
-#define DECLARE_ABSTRACT_PLUGGABLE_CLASS(name)
-#define IMPLEMENT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
-
-#define DECLARE_USER_EXPORTED_PLUGGABLE_CLASS(name, usergoo)
-#define DECLARE_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, usergoo)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_PLUGGABLE_CLASS2(name, basename1, basename2)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS(name, basename)
-#define IMPLEMENT_USER_EXPORTED_ABSTRACT_PLUGGABLE_CLASS2(name, basename1, basename2)
+#define CLASSINFO(name) (&name::ms_classInfo)

 
 

-#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
+// this cast does some more checks at compile time as it uses static_cast
+// internally
+//
+// note that it still has different semantics from dynamic_cast<> and so can't
+// be replaced by it as long as there are any compilers not supporting it

 #define wxDynamicCast(obj, className) \
 #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__
 
 #else  // !__WXDEBUG__

-#define wxStaticCast(obj, className) ((className *)(obj))
+#define wxStaticCast(obj, className) \
+    wx_const_cast(className *, wx_static_cast(const className *, obj))

 
 #endif  // __WXDEBUG__
 
 
 #endif  // __WXDEBUG__
 


@@ -390,8 +374,9 @@ inline void wxCheckCast(void *ptr)
     #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
 #endif
 
     #define _WX_WANT_DELETE_VOID_CONSTCHAR_SIZET
 #endif
 

-// Only VC++ 6.0 and CodeWarrior compilers get overloaded delete that matches new
-#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))
+// Only VC++ 6 and CodeWarrior get overloaded delete that matches new
+#if (defined(__VISUALC__) && (__VISUALC__ >= 1200)) || \
+        (defined(__MWERKS__) && (__MWERKS__ >= 0x2400))

     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
     #define _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 


@@ -415,34 +400,119 @@ inline void wxCheckCast(void *ptr)
 
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 
 
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 

-#endif // WXDEBUG && wxUSE_MEMORY_TRACING
+#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING

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

-// wxObject: the root class of wxWindows object hierarchy
+// wxObjectRefData: ref counted data meant to be stored in wxObject

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

-class WXDLLIMPEXP_BASE wxObject
+class WXDLLIMPEXP_BASE wxObjectRefData

 {
 {

-    DECLARE_ABSTRACT_CLASS(wxObject)
+    friend class WXDLLIMPEXP_FWD_BASE wxObject;
+
+public:
+    wxObjectRefData() : m_count(1) { }
+
+    int GetRefCount() const { return m_count; }
+
+    void IncRef() { m_count++; }
+    void DecRef();
+
+protected:
+    // this object should never be destroyed directly but only as a
+    // result of a DecRef() call:
+    virtual ~wxObjectRefData() { }
+
+private:
+    // our refcount:
+    int m_count;
+};
+
+// ----------------------------------------------------------------------------
+// wxObjectDataPtr: helper class to avoid memleaks because of missing calls
+//                  to wxObjectRefData::DecRef
+// ----------------------------------------------------------------------------
+
+template <class T>
+class wxObjectDataPtr
+{
+public:
+    typedef T element_type;
+
+    wxEXPLICIT wxObjectDataPtr(T *ptr = NULL) : m_ptr(ptr) {}
+
+    // copy ctor
+    wxObjectDataPtr(const wxObjectDataPtr<T> &tocopy) 
+        : m_ptr(tocopy.m_ptr)
+    { 
+        if (m_ptr)
+            m_ptr->IncRef(); 
+    }
+
+    ~wxObjectDataPtr() 
+    { 
+        if (m_ptr) 
+            m_ptr->DecRef(); 
+    }
+
+    T *get() const { return m_ptr; }
+    T *operator->() const { return get(); }
+
+    void reset(T *ptr)
+    {
+        if (m_ptr)
+            m_ptr->DecRef();
+        m_ptr = ptr;
+    }
+
+    wxObjectDataPtr& operator=(const wxObjectDataPtr &tocopy)
+    { 
+        if (m_ptr) 
+            m_ptr->DecRef(); 
+        m_ptr = tocopy.m_ptr; 
+        if (m_ptr)
+            m_ptr->IncRef(); 
+        return *this;
+    }
+
+    wxObjectDataPtr& operator=(T *ptr)
+    { 
+        if (m_ptr) 
+            m_ptr->DecRef(); 
+        m_ptr = ptr; 
+        if (m_ptr)
+            m_ptr->IncRef(); 
+        return *this;
+    }

 
 private:
 
 private:

-    void InitFrom(const wxObject& other);
+    T *m_ptr;
+};
+
+// ----------------------------------------------------------------------------
+// wxObject: the root class of wxWidgets object hierarchy
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxObject
+{
+    DECLARE_ABSTRACT_CLASS(wxObject)

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

-        {
-            InitFrom(other);
-        }
+    {
+         m_refData = other.m_refData;
+         if (m_refData)
+             m_refData->m_count++;
+    }

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

-            UnRef();
-            InitFrom(other);
+            Ref(other);

         }
         return *this;
     }
         }
         return *this;
     }


@@ -492,14 +562,20 @@ public:
     // destroy a reference
     void UnRef();
 
     // destroy a reference
     void UnRef();
 

+    // Make sure this object has only one reference
+    void UnShare() { AllocExclusive(); }
+
+    // check if this object references the same data as the other one
+    bool IsSameAs(const wxObject& o) const { return m_refData == o.m_refData; }
+

 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data
     // it is copied using CloneRefData(), otherwise nothing is done
     void AllocExclusive();
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data
     // it is copied using CloneRefData(), otherwise nothing is done
     void AllocExclusive();
 

-    // both methods must be implemented if Unshare() is used, not pure virtual
-    // only because of the backwards compatibility reasons
+    // both methods must be implemented if AllocExclusive() is used, not pure
+    // virtual only because of the backwards compatibility reasons

 
     // create a new m_refData
     virtual wxObjectRefData *CreateRefData() const;
 
     // create a new m_refData
     virtual wxObjectRefData *CreateRefData() const;


@@ -510,25 +586,6 @@ protected:
     wxObjectRefData *m_refData;
 };
 
     wxObjectRefData *m_refData;
 };
 

-// ----------------------------------------------------------------------------
-// wxObjectRefData: ref counted data meant to be stored in wxObject
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxObjectRefData
-{
-    friend class WXDLLIMPEXP_BASE wxObject;
-
-public:
-    wxObjectRefData() : m_count(1) { }
-    virtual ~wxObjectRefData() { }
-
-    int GetRefCount() const { return m_count; }
-
-private:
-    int m_count;
-};
-
-

 inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
 {
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;
 inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
 {
     return obj && obj->GetClassInfo()->IsKindOf(classInfo) ? obj : NULL;


@@ -537,18 +594,24 @@ inline wxObject *wxCheckDynamicCast(wxObject *obj, wxClassInfo *classInfo)
 #if wxUSE_EXTENDED_RTTI
 class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
 {
 #if wxUSE_EXTENDED_RTTI
 class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
 {

+    friend class WXDLLIMPEXP_FWD_BASE wxDynamicClassInfo ;

 public:
     // instantiates this object with an instance of its superclass
     wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;
 public:
     // instantiates this object with an instance of its superclass
     wxDynamicObject(wxObject* superClassInstance, const wxDynamicClassInfo *info) ;

-    ~wxDynamicObject();
+    virtual ~wxDynamicObject();

 
 

-    void SetProperty (const wxChar *PropertyName, const wxxVariant &Value);
-    wxxVariant GetProperty (const wxChar *PropertyName) const ;
+    void SetProperty (const wxChar *propertyName, const wxxVariant &value);
+    wxxVariant GetProperty (const wxChar *propertyName) const ;

 
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {
 
     // get the runtime identity of this object
     wxClassInfo *GetClassInfo() const
     {

-               return const_cast<wxClassInfo*>((const wxClassInfo*)m_classInfo);
+#ifdef _MSC_VER
+        return (wxClassInfo*) m_classInfo;
+#else
+        wxDynamicClassInfo *nonconst = wx_const_cast(wxDynamicClassInfo *, m_classInfo);
+        return wx_static_cast(wxClassInfo *, nonconst);
+#endif

     }
 
     wxObject* GetSuperClassInstance() const
     }
 
     wxObject* GetSuperClassInstance() const


@@ -556,6 +619,12 @@ public:
         return m_superClassInstance ;
     }
 private :
         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;
     wxObject *m_superClassInstance ;
     const wxDynamicClassInfo *m_classInfo;
     struct wxDynamicObjectInternal;


@@ -567,21 +636,24 @@ private :
 // more debugging macros
 // ----------------------------------------------------------------------------
 
 // more debugging macros
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
-    #ifndef WXDEBUG_NEW
-        #define WXDEBUG_NEW new(__TFILE__,__LINE__)
-    #endif
-#else // !__WXDEBUG__
-    #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.
 
 // 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(__TFILE__,__LINE__)
-#endif
-
-#endif  // _WX_OBJECTH__
+#ifdef __WXDEBUG__
+    #define WXDEBUG_NEW new(__TFILE__,__LINE__)
+
+    #if wxUSE_DEBUG_NEW_ALWAYS
+        #if wxUSE_GLOBAL_MEMORY_OPERATORS
+            #define new WXDEBUG_NEW
+        #elif defined(__VISUALC__)
+            // Including this file redefines new and allows leak reports to
+            // contain line numbers
+            #include "wx/msw/msvcrt.h"
+        #endif
+    #endif // wxUSE_DEBUG_NEW_ALWAYS
+#else // !__WXDEBUG__
+    #define WXDEBUG_NEW new
+#endif // __WXDEBUG__/!__WXDEBUG__

 
 

+#endif // _WX_OBJECTH__