X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..59720690dfa73732d165642d6e9cb8330a92549b:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index c37c0e9433..57d5f1c0d6 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/pen.h +// Name: wx/msw/pen.h // Purpose: wxPen class // Author: Julian Smart // Modified by: Vadim Zeitlin: fixed operator=(), ==(), !=() @@ -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,7 +89,8 @@ 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); @@ -138,4 +130,3 @@ private: }; #endif // _WX_PEN_H_ -