COW cleanup patch (1583966):
1. perform deep comparison for the classes for which it makes sense in the ports where this wasn't done yet 2. remove (shallow) comparison operators for the classes for which it does not make sense (such as wxBitmap) 3. makes wxBitmap use COW on all ports 4. adds wxObject::IsRefTo() 5. centralizes and improves COW docs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,11 +33,6 @@ public:
|
||||
|
||||
wxAnimation& operator= (const wxAnimation&);
|
||||
|
||||
bool operator == (const wxAnimation& anim) const
|
||||
{ return m_pixbuf == anim.m_pixbuf; }
|
||||
bool operator != (const wxAnimation& anim) const
|
||||
{ return m_pixbuf != anim.m_pixbuf; }
|
||||
|
||||
virtual bool IsOk() const
|
||||
{ return m_pixbuf != NULL; }
|
||||
|
||||
|
@@ -64,8 +64,6 @@ public:
|
||||
wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
|
||||
wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
|
||||
virtual ~wxBitmap();
|
||||
bool operator == ( const wxBitmap& bmp ) const;
|
||||
bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }
|
||||
bool Ok() const { return IsOk(); }
|
||||
bool IsOk() const;
|
||||
|
||||
|
@@ -32,8 +32,6 @@ public:
|
||||
int hotSpotX=-1, int hotSpotY=-1,
|
||||
const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
|
||||
virtual ~wxCursor();
|
||||
bool operator == ( const wxCursor& cursor ) const;
|
||||
bool operator != ( const wxCursor& cursor ) const;
|
||||
bool Ok() const { return IsOk(); }
|
||||
bool IsOk() const;
|
||||
|
||||
|
@@ -94,6 +94,7 @@ class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
|
||||
public:
|
||||
wxRegionIterator();
|
||||
wxRegionIterator(const wxRegion& region);
|
||||
~wxRegionIterator();
|
||||
|
||||
void Reset() { m_current = 0u; }
|
||||
void Reset(const wxRegion& region);
|
||||
@@ -113,9 +114,15 @@ public:
|
||||
wxRect GetRect() const;
|
||||
|
||||
private:
|
||||
void Init();
|
||||
void CreateRects( const wxRegion& r );
|
||||
|
||||
size_t m_current;
|
||||
wxRegion m_region;
|
||||
|
||||
wxRect *m_rects;
|
||||
size_t m_numRects;
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
|
||||
};
|
||||
|
Reference in New Issue
Block a user