Make wxRefCounter non copyable.

wxRefCounter copy ctor was wrong as the new object had the same reference
count as the old one instead of starting its life with reference count set to
1 as any new object should.

While we could fix its copy ctor, it seems to be better to forbid copying
wxRefCounter objects at all because the semantics of doing this is not obvious
and the compiler-generated copy ctor in the derived classes often doesn't do
what the code using it expects it to do, as was discovered by making
wxRefCounter non copyable: see the fixes in the previous commits.

To uncover all such bugs, make wxRefCounter and classes deriving from it non
copyable. If this uncovers more problems, they should be fixed by implementing
copying properly (and explicitly) in the derived classes.

Closes #12768.

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

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index a7f946d2d67a09f1b0028098f6988dbed6c532d4..d38a44bb7e5065fee1d74ad9a3199e713c9243da 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -23,9 +23,16 @@
 class WXDLLIMPEXP_CORE wxGDIRefData : public wxObjectRefData
 {
 public:
+    // Default ctor which needs to be defined just because we use
+    // wxDECLARE_NO_COPY_CLASS() below.
+    wxGDIRefData() { }
+
     // override this in the derived classes to check if this data object is
     // really fully initialized
     virtual bool IsOk() const { return true; }
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxGDIRefData);
 };
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h
index 10810cf42b500fac84cd76f2a606b38a63bc0985..a2016597c2e7e62aaa4a858f5c928b6d224e4c44 100644 (file)
--- a/include/wx/msw/gdiimage.h
+++ b/include/wx/msw/gdiimage.h
@@ -40,7 +40,7 @@ public:
         m_handle = 0;
     }
 
-    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData(data)
+    wxGDIImageRefData(const wxGDIImageRefData& data) : wxGDIRefData()
     {
         m_width = data.m_width;
         m_height = data.m_height;

diff --git a/include/wx/object.h b/include/wx/object.h
index 80fbae4d2b8c3f91207e08e6de90c5a74193bd6e..5c14734fdd78646455b28bdfe037086f2f097451 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -422,6 +422,12 @@ protected:
 private:
     // our refcount:
     int m_count;
+
+    // It doesn't make sense to copy the reference counted objects, a new ref
+    // counter should be created for a new object instead and compilation
+    // errors in the code using wxRefCounter due to the lack of copy ctor often
+    // indicate a problem, e.g. a forgotten copy ctor implementation somewhere.
+    wxDECLARE_NO_COPY_CLASS(wxRefCounter);
 };
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index e87312bc5e4f77d524185f466e847c2d7fdb5699..b59a47864e1149a9bd6f3afed2e36541099f42e8 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -42,7 +42,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 class WXDLLEXPORT wxIconBundleRefData : public wxGDIRefData
 {
 public:
-    // default and copy ctors and assignment operators are ok
+    wxIconBundleRefData() { }
+
+    // We need the copy ctor for CloneGDIRefData() but notice that we use the
+    // base class default ctor in it and not the copy one which it doesn't have.
+    wxIconBundleRefData(const wxIconBundleRefData& other)
+        : wxGDIRefData(),
+          m_icons(other.m_icons)
+    {
+    }
+
+    // default assignment operator and dtor are ok
 
     virtual bool IsOk() const { return !m_icons.empty(); }