X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc6ceca789f584cf3fc3fc17f6da4b7493ca69bd..13a3888794c97e06686a9f40189d63f708e891ba:/include/wx/weakref.h diff --git a/include/wx/weakref.h b/include/wx/weakref.h index 99621fca49..6691b60d6d 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -59,7 +59,7 @@ protected: } } - void AssignCopy( const wxWeakRefStatic& wr ) + void AssignCopy(const wxWeakRefStatic& wr) { Assign( wr.m_pobj ); } @@ -74,8 +74,13 @@ protected: T *m_pobj; }; -#ifdef HAVE_PARTIAL_SPECIALIZATION +#if !defined(HAVE_PARTIAL_SPECIALIZATION) || !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) + #define USE_STATIC_WEAKREF +#endif + + +#ifndef USE_STATIC_WEAKREF template struct wxWeakRefImpl; @@ -139,7 +144,7 @@ protected: void AssignCopy(const wxWeakRefImpl& wr) { - DoAssign( wr.m_pobj, wr.m_ptbase ); + DoAssign(wr.m_pobj, wr.m_ptbase); } void DoAssign( T* pobj, wxTrackable *ptbase ) { @@ -169,17 +174,18 @@ protected: wxTrackable *m_ptbase; }; -#endif // HAVE_PARTIAL_SPECIALIZATION +#endif // #ifndef USE_STATIC_WEAKREF + // A weak reference to an object of type T, where T has type wxTrackable // (usually statically but if not dynamic_cast<> is tried). template class wxWeakRef : public -#ifdef HAVE_PARTIAL_SPECIALIZATION - wxWeakRefImpl::value> -#else +#ifdef USE_STATIC_WEAKREF wxWeakRefStatic +#else + wxWeakRefImpl::value> #endif { public: @@ -194,6 +200,12 @@ public: Assign(pobj); } + // We need this copy ctor, since otherwise a default compiler (binary) copy happens + wxWeakRef(const wxWeakRef& wr) + { + Assign(wr.get()); + } + template wxWeakRef& operator=(TDerived* pobj) { @@ -207,27 +219,20 @@ public: return *this; } - virtual ~wxWeakRef() { Release(); } + virtual ~wxWeakRef() { this->Release(); } // Smart pointer functions - T& operator*() const { return *m_pobj; } - T* operator->() const { return m_pobj; } + T& operator*() const { return *this->m_pobj; } + T* operator->() const { return this->m_pobj; } - T* get() const { return m_pobj; } - - // test for pointer validity: defining conversion to unspecified_bool_type - // and not more obvious bool to avoid implicit conversions to integer types - typedef T *(wxWeakRef::*unspecified_bool_type)() const; - operator unspecified_bool_type() const - { - return this->m_pobj ? &wxWeakRef::get : NULL; - } + T* get() const { return this->m_pobj; } + operator T*() const { return get(); } }; // Weak ref implementation assign objects are queried for wxTrackable // using dynamic_cast<> -template +template class wxWeakRefDynamic : public wxTrackerNode { public: @@ -300,11 +305,6 @@ protected: } } - void AssignCopy(const wxWeakRefDynamic& wr) - { - Assign(wr.m_pobj); - } - virtual void OnObjectDestroy() { wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" ); @@ -317,7 +317,7 @@ protected: // Provide some basic types of weak references class WXDLLIMPEXP_FWD_BASE wxEvtHandler; -class WXDLLIMPEXP_FWD_BASE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxWindow; typedef wxWeakRef wxEvtHandlerRef; typedef wxWeakRef wxWindowRef;