X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..16f10340daf29ae98fc50bbc12a50faec884c676:/include/wx/msw/brush.h diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h index d034e59cd4..782bc57f2d 100644 --- a/include/wx/msw/brush.h +++ b/include/wx/msw/brush.h @@ -26,13 +26,13 @@ class WXDLLEXPORT wxBrush; // wxBrush // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxBrush : public wxGDIObject +class WXDLLEXPORT wxBrush : public wxBrushBase { public: wxBrush(); wxBrush(const wxColour& col, int style = wxSOLID); wxBrush(const wxBitmap& stipple); - wxBrush(const wxBrush& brush) : wxGDIObject(brush) { Ref(brush); } + wxBrush(const wxBrush& brush) : wxBrushBase(brush) { Ref(brush); } virtual ~wxBrush(); virtual void SetColour(const wxColour& col); @@ -45,12 +45,9 @@ public: bool operator!=(const wxBrush& brush) const { return !(*this == brush); } wxColour GetColour() const; - int GetStyle() const; + virtual int GetStyle() const; wxBitmap *GetStipple() const; - bool IsHatch() const - { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); } - bool Ok() const { return m_refData != NULL; } // return the HBRUSH for this brush