X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f2468e96a3887eb767ed6fcf452834a4c7b7a28..59576592b815f62ca78c04851c0b3fd7fa0eb9bd:/include/wx/weakref.h diff --git a/include/wx/weakref.h b/include/wx/weakref.h index 08878903f4..b692f037e8 100644 --- a/include/wx/weakref.h +++ b/include/wx/weakref.h @@ -3,7 +3,6 @@ // Purpose: wxWeakRef - Generic weak references for wxWidgets // Author: Arne Steinarson // Created: 27 Dec 07 -// RCS-ID: $Id$ // Copyright: (c) 2007 Arne Steinarson // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +16,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) || \ @@ -218,7 +217,7 @@ public: // below is not used by at least g++4 when a literal NULL is used wxWeakRef(T *pobj) { - Assign(pobj); + this->Assign(pobj); } #endif // !__VISUALC6__ @@ -227,19 +226,19 @@ public: 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()); + this->Assign(wr.get()); } wxWeakRef& operator=(const wxWeakRef& wr) { - AssignCopy(wr); + this->AssignCopy(wr); return *this; }