X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..2be7beda2d186af20ce9f0cd2bc28352d890db77:/include/wx/os2/brush.h diff --git a/include/wx/os2/brush.h b/include/wx/os2/brush.h index 71661f2277..f1d7be63e6 100644 --- a/include/wx/os2/brush.h +++ b/include/wx/os2/brush.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxBrushRefData: public wxGDIRefData public: wxBrushRefData(); wxBrushRefData(const wxBrushRefData& rData); - ~wxBrushRefData(); + virtual ~wxBrushRefData(); protected: int m_nStyle; @@ -45,15 +45,13 @@ public: wxBrush(); wxBrush(const wxColour& rCol, int nStyle = wxSOLID); wxBrush(const wxBitmap& rStipple); - inline wxBrush(const wxBrush& rBrush) { Ref(rBrush); } - ~wxBrush(); + virtual ~wxBrush(); - inline wxBrush& operator = (const wxBrush& rBrush) { if (*this == rBrush) return (*this); Ref(rBrush); return *this; } inline bool operator == (const wxBrush& rBrush) const { return m_refData == rBrush.m_refData; } inline bool operator != (const wxBrush& rBrush) const { return m_refData != rBrush.m_refData; } virtual void SetColour(const wxColour& rColour); - virtual void SetColour(const unsigned char cRed, const unsigned char cGreen, const unsigned char cBrush); + virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush); virtual void SetPS(HPS hPS); virtual void SetStyle(int nStyle) ; virtual void SetStipple(const wxBitmap& rStipple); @@ -63,7 +61,8 @@ public: 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); }; - inline virtual bool Ok(void) const { return (m_refData != NULL) ; } + inline virtual bool Ok() const { return IsOk(); } + inline virtual bool IsOk(void) const { return (m_refData != NULL) ; } // // Implementation