X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..cf0cf17b0058bca4f7144b474a906d73b4fd06ef:/include/wx/mac/classic/brush.h?ds=sidebyside diff --git a/include/wx/mac/classic/brush.h b/include/wx/mac/classic/brush.h index c410e26d8b..9406bd4a72 100644 --- a/include/wx/mac/classic/brush.h +++ b/include/wx/mac/classic/brush.h @@ -30,7 +30,7 @@ typedef enum } wxMacBrushKind ; // Brush -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) @@ -40,7 +40,7 @@ public: wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); wxBrush(const wxBrush& brush) - : wxGDIObject() + : wxBrushBase() { Ref(brush); } ~wxBrush(); @@ -63,12 +63,9 @@ public: unsigned long GetMacThemeBackground(WXRECTPTR extent) const ; short GetMacTheme() const ; 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) ; } // Implementation