X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46562151eb21235344768ea4b53c204d0c03fcee..1ab48408d13344ff0e46bd397d7dc89889e48fba:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index b5439e8bdf..57d5f1c0d6 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -77,17 +77,8 @@ public: wxPen(); wxPen(const wxColour& col, int width = 1, int style = wxSOLID); wxPen(const wxBitmap& stipple, int width); - wxPen(const wxPen& pen) : wxGDIObject(pen) { Ref(pen); } virtual ~wxPen(); - wxPen& operator=(const wxPen& pen) - { - if ( this != &pen ) - Ref(pen); - - return *this; - } - bool operator==(const wxPen& pen) const { const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; @@ -98,11 +89,12 @@ public: bool operator!=(const wxPen& pen) const { return !(*this == pen); } - 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);