X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..3e6858cdcb9278b36446466c346d984e7e306553:/include/wx/cocoa/brush.h?ds=sidebyside diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index 050fad8454..a3d41f8e98 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/brush.h +// Name: wx/cocoa/brush.h // Purpose: wxBrush class // Author: David Elliott // Modified by: @@ -16,12 +16,12 @@ #include "wx/gdiobj.h" #include "wx/bitmap.h" -class WXDLLEXPORT wxBrush; +class WXDLLIMPEXP_FWD_CORE wxBrush; // ======================================================================== // wxBrush // ======================================================================== -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ @@ -29,48 +29,35 @@ class WXDLLEXPORT wxBrush: public wxGDIObject // ------------------------------------------------------------------------ public: wxBrush(); - wxBrush(const wxColour& col, int style = wxSOLID); + wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxGDIObject() - { Ref(brush); } - ~wxBrush(); + virtual ~wxBrush(); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ - virtual void SetColour(const wxColour& col) ; - 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; } + virtual void SetColour(const wxColour& col) ; + virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; + virtual void SetStyle(wxBrushStyle style) ; + virtual void SetStipple(const wxBitmap& stipple) ; // comparison - bool operator == (const wxBrush& brush) + bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; } - bool operator != (const wxBrush& brush) + bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; } // accessors wxColour GetColour() const; - int GetStyle() const; + virtual wxBrushStyle GetStyle() const; wxBitmap *GetStipple() const; - bool IsHatch() const - { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); } - - virtual bool Ok() const - { return (m_refData != NULL); } - - // wxObjectRefData - wxObjectRefData *CreateRefData() const; - wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; - // wxCocoa WX_NSColor GetNSColor(); + +protected: + wxGDIRefData *CreateGDIRefData() const; + wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; }; #endif // __WX_COCOA_BRUSH_H__