X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/014b109195afb6be5773df434f2900df325d0774..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/weakref.h diff --git a/include/wx/weakref.h b/include/wx/weakref.h index 00e7fa1229..e612db81b2 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -17,7 +17,7 @@ // 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) +// 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) || \ @@ -149,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 @@ -165,7 +165,7 @@ protected: Release(); } } -#endif // HAVE_DYNAMIC_CAST +#endif // RTTI enabled void AssignCopy(const wxWeakRefImpl& wr) { @@ -202,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 // 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; } @@ -248,7 +254,7 @@ public: }; -#ifdef HAVE_DYNAMIC_CAST +#ifndef wxNO_RTTI // Weak ref implementation assign objects are queried for wxTrackable // using dynamic_cast<> @@ -332,7 +338,7 @@ protected: T *m_pobj; }; -#endif // #ifdef HAVE_DYNAMIC_CAST +#endif // RTTI enabled // Provide some basic types of weak references