X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/classic/pen.h diff --git a/include/wx/mac/classic/pen.h b/include/wx/mac/classic/pen.h index cac09f1310..cc6e3e6bb3 100644 --- a/include/wx/mac/classic/pen.h +++ b/include/wx/mac/classic/pen.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxPenRefData: public wxGDIRefData public: wxPenRefData(); wxPenRefData(const wxPenRefData& data); - ~wxPenRefData(); + virtual ~wxPenRefData(); wxPenRefData& operator=(const wxPenRefData& data); @@ -52,20 +52,17 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - wxPen(const wxPen& pen) - : wxGDIObject() - { Ref(pen); } - ~wxPen(); + virtual ~wxPen(); - inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; } inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; } - virtual bool Ok() const { return (m_refData != NULL) ; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return (m_refData != NULL) ; } // Override in order to recreate the pen void SetColour(const wxColour& col) ; - void SetColour(const unsigned char r, const unsigned char g, const unsigned char b) ; + void SetColour(unsigned char r, unsigned char g, unsigned char b) ; void SetWidth(int width) ; void SetStyle(int style) ;