Fix wxOSX warnings about int-to-void* casts.

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

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 08878903f48ada52804553a10c6c04c425a2b7bd..b692f037e8650703bbb9e4e8d604e072f8617e44 100644 (file)
--- 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<wxObject>). 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 <class TDerived>
     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<T>& wr)
     {
-        Assign(wr.get());
+        this->Assign(wr.get());
     }
 
     wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
     {
-        AssignCopy(wr);
+        this->AssignCopy(wr);
         return *this;
     }