X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab9d0a8ca3d306898d92960ecfaefb8c1191b18a..26531700c7ec84872c60899ce6219954499086da:/include/wx/os2/brush.h?ds=sidebyside diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 3655cfeaf4..365a4a0575 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -37,7 +37,7 @@ protected: #define M_BRUSHDATA ((wxBrushRefData *)m_refData) // Brush -class WXDLLEXPORT wxBrush: public wxGDIObject +class WXDLLEXPORT wxBrush: public wxBrushBase { DECLARE_DYNAMIC_CLASS(wxBrush) @@ -64,13 +64,10 @@ public: virtual void SetStipple(const wxBitmap& rStipple); inline wxColour& GetColour(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_vColour : wxNullColour); }; - inline int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); }; + virtual int GetStyle(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_nStyle : 0); }; inline wxBitmap* GetStipple(void) const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_vStipple : 0); }; inline int GetPS(void) const { return (M_BRUSHDATA ? M_BRUSHDATA->m_hBrush : 0); }; - bool IsHatch() const - { return (GetStyle()>=wxBDIAGONAL_HATCH) && (GetStyle()<=wxVERTICAL_HATCH); } - inline virtual bool Ok(void) const { return (m_refData != NULL) ; } //