Apply parts of patch #1719888 to fix compilation on Mac and with

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 38f714596ca7379be0857ee663d4e7a542aa5c8a..0651b16acbc4d02455597b77369a7b41733c0f9e 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,15 +13,10 @@
 #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"
 
 class WXDLLIMPEXP_BASE wxObject;
 #include "wx/memory.h"
 
 class WXDLLIMPEXP_BASE wxObject;


@@ -30,6 +25,37 @@ class WXDLLIMPEXP_BASE wxObject;
 #define wxUSE_EXTENDED_RTTI 0
 #endif
 
 #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


@@ -38,18 +64,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 wxClassInfo;
 class WXDLLIMPEXP_BASE wxHashTable;

+class WXDLLIMPEXP_BASE wxObject;
+class WXDLLIMPEXP_BASE wxPluginLibrary;

 class WXDLLIMPEXP_BASE wxObjectRefData;
 class WXDLLIMPEXP_BASE wxObjectRefData;

+class WXDLLIMPEXP_BASE wxHashTable_Node;

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


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

+    friend class WXDLLIMPEXP_BASE wxObject;
+    friend WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxChar *name);

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


@@ -78,7 +100,9 @@ public:
 
     ~wxClassInfo();
 
 
     ~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


@@ -89,7 +113,8 @@ 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 wxClassInfo        *FindClass(const wxChar *className);
     static const wxClassInfo  *GetFirst() { return sm_first; }
     const wxClassInfo         *GetNext() const { return m_next; }
     static wxClassInfo        *FindClass(const wxChar *className);


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

-#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:
+    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;


@@ -129,29 +147,18 @@ 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:
     // registers the class
     void Register();
     void Unregister();
 protected:
     // registers the class
     void Register();
     void Unregister();

+
+    DECLARE_NO_COPY_CLASS(wxClassInfo)

 };
 
 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------


@@ -191,7 +198,7 @@ inline void wxClassInfo::CleanUpClasses() {}
     wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
 
 #define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \
     wxIMPLEMENT_CLASS_COMMON(name, basename, NULL, func)
 
 #define wxIMPLEMENT_CLASS_COMMON2(name, basename1, basename2, func)           \

-    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo)
+    wxIMPLEMENT_CLASS_COMMON(name, basename1, &basename2::ms_classInfo, func)

 
 // -----------------------------------
 // for concrete classes
 
 // -----------------------------------
 // for concrete classes


@@ -366,8 +373,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
 


@@ -393,6 +401,93 @@ inline void* wxCheckCast(void *ptr)
 
 #endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
 
 
 #endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
 

+// ----------------------------------------------------------------------------
+// wxObjectRefData: ref counted data meant to be stored in wxObject
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_BASE wxObjectRefData
+{
+    friend class WXDLLIMPEXP_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:
+    T *m_ptr;
+};
+

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


@@ -401,24 +496,22 @@ class WXDLLIMPEXP_BASE wxObject
 {
     DECLARE_ABSTRACT_CLASS(wxObject)
 
 {
     DECLARE_ABSTRACT_CLASS(wxObject)
 

-private:
-    void InitFrom(const wxObject& other);
-

 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;
     }


@@ -468,17 +561,11 @@ public:
     // destroy a reference
     void UnRef();
 
     // destroy a reference
     void UnRef();
 

+    // Make sure this object has only one reference
+    void UnShare() { AllocExclusive(); }

 
 

-    // Reserved for future use
-    virtual void ReservedObjectFunc1() {}
-    virtual void ReservedObjectFunc2() {}
-    virtual void ReservedObjectFunc3() {}
-    virtual void ReservedObjectFunc4() {}
-    virtual void ReservedObjectFunc5() {}
-    virtual void ReservedObjectFunc6() {}
-    virtual void ReservedObjectFunc7() {}
-    virtual void ReservedObjectFunc8() {}
-    virtual void ReservedObjectFunc9() {}
+    // 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
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no


@@ -486,8 +573,8 @@ protected:
     // it is copied using CloneRefData(), otherwise nothing is done
     void AllocExclusive();
 
     // 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;


@@ -498,25 +585,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;


@@ -529,7 +597,7 @@ class WXDLLIMPEXP_BASE wxDynamicObject : public wxObject
 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 ;


@@ -540,7 +608,8 @@ public:
 #ifdef _MSC_VER
         return (wxClassInfo*) m_classInfo;
 #else
 #ifdef _MSC_VER
         return (wxClassInfo*) m_classInfo;
 #else

-        return wx_const_cast(wxClassInfo *, m_classInfo);
+        wxDynamicClassInfo *nonconst = wx_const_cast(wxDynamicClassInfo *, m_classInfo);
+        return wx_static_cast(wxClassInfo *, nonconst);

 #endif
     }
 
 #endif
     }
 


@@ -566,24 +635,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__)
-#elif (defined(__WXDEBUG__) && defined(__VISUALC__) && !wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS)
-    // Including this file redefines new and allows leak reports to contain line numbers
-    #include "wx/msw/msvcrt.h"
-#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__