X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/cocoa/brush.h?ds=sidebyside diff --git a/include/wx/cocoa/brush.h b/include/wx/cocoa/brush.h index 050fad8454..e3d793db54 100644 --- a/include/wx/cocoa/brush.h +++ b/include/wx/cocoa/brush.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxBrush; // ======================================================================== // wxBrush // ======================================================================== -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) // ------------------------------------------------------------------------ @@ -32,7 +32,7 @@ public: wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); wxBrush(const wxBrush& brush) - : wxGDIObject() + : wxBrushBase() { Ref(brush); } ~wxBrush(); @@ -56,12 +56,9 @@ public: // accessors wxColour GetColour() const; - int GetStyle() const; + virtual int GetStyle() const; wxBitmap *GetStipple() const; - bool IsHatch() const - { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); } - virtual bool Ok() const { return (m_refData != NULL); }