X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/074574b4a6022bd04b3f582b81551e9c75d46b18..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/weakref.h?ds=sidebyside diff --git a/include/wx/weakref.h b/include/wx/weakref.h index 74b590d627..e612db81b2 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -14,15 +14,17 @@ #include "wx/tracker.h" -// Some compilers (VC6, Borland, otehrs?) have problem with template specialization. +// Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization. // However, this is only used for optimization purposes (a smaller wxWeakRef pointer) -// (and the corner case of wxWeakRef). So for those compilers, we can fall -// back to the non-optimal case, where we use a the same type of weak ref (static one) +// (and the corner case of wxWeakRef). So for those compilers, we can fall +// back to the non-optimal case, where we use the same type of weak ref (static one) // in all cases. See defs.h for various setting these defines depending on compiler. -#if !defined(HAVE_PARTIAL_SPECIALIZATION) || !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) - #define USE_ONLY_STATIC_WEAKREF -#endif +#if !defined(HAVE_PARTIAL_SPECIALIZATION) || \ + !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) || \ + (defined(__GNUC__) && !wxCHECK_GCC_VERSION(3, 3)) + #define USE_ONLY_STATIC_WEAKREF +#endif #ifndef USE_ONLY_STATIC_WEAKREF @@ -59,6 +61,13 @@ public: } } + virtual void OnObjectDestroy() + { + // Tracked object itself removes us from list of trackers + wxASSERT(m_pobj != NULL); + m_pobj = NULL; + } + protected: void Assign(T* pobj) { @@ -82,13 +91,6 @@ protected: Assign( wr.m_pobj ); } - virtual void OnObjectDestroy() - { - // Tracked object itself removes us from list of trackers - wxASSERT( m_pobj!=NULL ); - m_pobj = NULL; - } - T *m_pobj; }; @@ -122,6 +124,14 @@ struct wxWeakRefImpl : public wxTrackerNode } } + virtual void OnObjectDestroy() + { + // Tracked object itself removes us from list of trackers + wxASSERT(m_pobj != NULL); + m_pobj = NULL; + m_ptbase = NULL; + } + protected: wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { } @@ -139,7 +149,7 @@ protected: DoAssign( pobj, ptbase ); } -#ifdef HAVE_DYNAMIC_CAST +#ifndef wxNO_RTTI void AssignHelper(T* pobj, wxInt2Type) { // A last way to get a trackable pointer @@ -155,7 +165,7 @@ protected: Release(); } } -#endif // HAVE_DYNAMIC_CAST +#endif // RTTI enabled void AssignCopy(const wxWeakRefImpl& wr) { @@ -177,14 +187,6 @@ protected: } } - virtual void OnObjectDestroy() - { - // Tracked object itself removes us from list of trackers - wxASSERT( m_pobj!=NULL ); - m_pobj = NULL; - m_ptbase = NULL; - } - T *m_pobj; wxTrackable *m_ptbase; }; @@ -200,38 +202,44 @@ class wxWeakRef : public #ifdef USE_ONLY_STATIC_WEAKREF wxWeakRefStatic #else - wxWeakRefImpl::value> + wxWeakRefImpl::value != 0> #endif { public: + typedef T element_type; + // Default ctor wxWeakRef() { } + // Enabling this ctor for VC6 results in mysterious compilation failures in + // wx/window.h when assigning wxWindow pointers (FIXME-VC6) +#ifndef __VISUALC6__ + // Ctor from the object of this type: this is needed as the template ctor + // below is not used by at least g++4 when a literal NULL is used + wxWeakRef(T *pobj) + { + this->Assign(pobj); + } +#endif // !__VISUALC6__ + // When we have the full type here, static_cast<> will always work // (or give a straight compiler error). template wxWeakRef(TDerived* pobj) { - Assign(pobj); + this->Assign(pobj); } - // We need this copy ctor, since otherwise a default compiler (binary) copy + // We need this copy ctor, since otherwise a default compiler (binary) copy // happens (if embedded as an object member). wxWeakRef(const wxWeakRef& wr) { - Assign(wr.get()); - } - - template - wxWeakRef& operator=(TDerived* pobj) - { - this->Assign(pobj); - return *this; + this->Assign(wr.get()); } wxWeakRef& operator=(const wxWeakRef& wr) { - AssignCopy(wr); + this->AssignCopy(wr); return *this; } @@ -246,7 +254,7 @@ public: }; -#ifdef HAVE_DYNAMIC_CAST +#ifndef wxNO_RTTI // Weak ref implementation assign objects are queried for wxTrackable // using dynamic_cast<> @@ -265,18 +273,18 @@ public: { Assign(wr.get()); } - + virtual ~wxWeakRefDynamic() { Release(); } // Smart pointer functions T& operator*() const { wxASSERT(m_pobj); return *m_pobj; } T* operator->() const { wxASSERT(m_pobj); return m_pobj; } - + T* get() const { return m_pobj; } operator T* () const { return m_pobj; } T* operator = (T* pobj) { Assign(pobj); return m_pobj; } - + // Assign from another weak ref, point to same object T* operator = (const wxWeakRef &wr) { Assign( wr.get() ); return m_pobj; } @@ -293,6 +301,13 @@ public: } } + virtual void OnObjectDestroy() + { + wxASSERT_MSG(m_pobj, "tracked object should have removed us itself"); + + m_pobj = NULL; + } + protected: void Assign(T *pobj) { @@ -320,17 +335,10 @@ protected: } } - virtual void OnObjectDestroy() - { - wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" ); - - m_pobj = NULL; - } - T *m_pobj; }; -#endif // #ifdef HAVE_DYNAMIC_CAST +#endif // RTTI enabled // Provide some basic types of weak references