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
This commit is contained in:
@@ -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);
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -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(); }
|
||||
|
||||
|
Reference in New Issue
Block a user