add public wxObject::UnShare

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

diff --git a/include/wx/object.h b/include/wx/object.h
index e66613c3dcb61ee574a575492c3f8c0e82c5829d..dfb88a48c62f946e4c7fe80caeeb14b8b0483669 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -17,7 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/defs.h"

 #include "wx/memory.h"
 
 class WXDLLIMPEXP_BASE wxObject;
 #include "wx/memory.h"
 
 class WXDLLIMPEXP_BASE wxObject;


@@ -471,13 +470,16 @@ public:
     // destroy a reference
     void UnRef();
 
     // destroy a reference
     void UnRef();
 

+    // Make sure this object has only one reference
+    void UnShare() { AllocExclusive(); }
+

 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data
     // it is copied using CloneRefData(), otherwise nothing is done
     void AllocExclusive();
 
 protected:
     // ensure that our data is not shared with anybody else: if we have no
     // data, it is created using CreateRefData() below, if we have shared data
     // it is copied using CloneRefData(), otherwise nothing is done
     void AllocExclusive();
 

-    // both methods must be implemented if Unshare() is used, not pure virtual
+    // both methods must be implemented if AllocExclusive() is used, not pure virtual

     // only because of the backwards compatibility reasons
 
     // create a new m_refData
     // only because of the backwards compatibility reasons
 
     // create a new m_refData