Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 08878903f48ada52804553a10c6c04c425a2b7bd..a17c36d91b2ca6e581ca132c808aea0ce3222fd8 100644 (file)
--- 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<wxObject>). So for those compilers, we can fall
 // 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) || \
 // in all cases. See defs.h for various setting these defines depending on compiler.
 
 #if !defined(HAVE_PARTIAL_SPECIALIZATION) || \


@@ -218,7 +218,7 @@ public:
     // below is not used by at least g++4 when a literal NULL is used
     wxWeakRef(T *pobj)
     {
     // 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__
 
     }
 #endif // !__VISUALC6__
 


@@ -239,7 +239,7 @@ public:
 
     wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
     {
 
     wxWeakRef<T>& operator=(const wxWeakRef<T>& wr)
     {

-        AssignCopy(wr);
+        this->AssignCopy(wr);

         return *this;
     }
 
         return *this;
     }