X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/cocoa/brush.h?ds=sidebyside diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index dfee4ddf87..47970da8cc 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/cocoa/brush.h +// Name: wx/cocoa/brush.h // Purpose: wxBrush class // Author: David Elliott // Modified by: // Created: 2003/07/03 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __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 wxGDIObject +class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ @@ -29,45 +29,43 @@ class WXDLLEXPORT wxBrush: public wxGDIObject // ------------------------------------------------------------------------ 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) - : 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; - 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__