[ 1957970 ] wxWeakRef - assign from other wxWeakRef

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index d72ab4ccbc91100c5261112c2d7dbe4aaf17bf3b..6691b60d6d502e53f8acceda534d0e8daeef569d 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -200,6 +200,12 @@ public:
         Assign(pobj);
     }
 
         Assign(pobj);
     }
 

+    // We need this copy ctor, since otherwise a default compiler (binary) copy happens
+    wxWeakRef(const wxWeakRef<T>& wr)
+    {
+        Assign(wr.get());
+    }
+    

     template <class TDerived>
     wxWeakRef<T>& operator=(TDerived* pobj)
     {
     template <class TDerived>
     wxWeakRef<T>& operator=(TDerived* pobj)
     {

diff --git a/interface/weakref.h b/interface/weakref.h
index 03a96631303608bd1138a6c62c448955c930bef3..f6522aa39928afd17226f585e3c86566bc39e4ee 100644 (file)
--- a/interface/weakref.h
+++ b/interface/weakref.h
@@ -105,6 +105,11 @@ public:
     */
     wxWeakRef(T* pobj = NULL);
 
     */
     wxWeakRef(T* pobj = NULL);
 

+    /**
+        Copy constructor.
+    */
+    wxWeakRef(const wxWeakRef<T>& wr);
+    

     /**
         Destructor.
     */
     /**
         Destructor.
     */