X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a1498c08b07625baa087622e75637a2f15325b6..6b30ffedb18b86329fdc41ac1be27bc85bd758ff:/include/wx/cocoa/brush.h diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index d4e48e0733..47970da8cc 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -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 wxBrushBase +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ @@ -29,25 +29,21 @@ class WXDLLEXPORT wxBrush: public wxBrushBase // ------------------------------------------------------------------------ public: wxBrush(); - wxBrush(const wxColour& col, int style = wxSOLID); + wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); +#endif wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) - : wxBrushBase() - { 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 SetStyle(wxBrushStyle 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; } @@ -56,18 +52,20 @@ public: // accessors wxColour GetColour() const; - virtual int GetStyle() const; + virtual wxBrushStyle GetStyle() const; wxBitmap *GetStipple() const; - virtual bool Ok() const - { return (m_refData != NULL); } - - // wxObjectRefData - wxObjectRefData *CreateRefData() const; - wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; +#if FUTURE_WXWIN_COMPATIBILITY_3_0 + wxDEPRECATED_FUTURE( void SetStyle(int style) ) + { SetStyle((wxBrushStyle)style); } +#endif // wxCocoa WX_NSColor GetNSColor(); + +protected: + wxGDIRefData *CreateGDIRefData() const; + wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; }; #endif // __WX_COCOA_BRUSH_H__