X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/cocoa/brush.h diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index d3655e5146..31db6fc5c4 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -16,7 +16,7 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; // ======================================================================== // wxBrush @@ -31,23 +31,16 @@ public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxBrushBase() - { Ref(brush); } - ~wxBrush(); + virtual ~wxBrush(); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ virtual void SetColour(const wxColour& col) ; - virtual void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; virtual void SetStyle(int style) ; virtual void SetStipple(const wxBitmap& stipple) ; - // assignment - wxBrush& operator = (const wxBrush& brush) - { if (*this == brush) return (*this); Ref(brush); return *this; } - // comparison bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; } @@ -59,7 +52,8 @@ public: virtual int GetStyle() const; wxBitmap *GetStipple() const; - virtual bool Ok() const + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL); } // wxObjectRefData