X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/236a9de39afa090fdee3cf91cb5364ceca69e3f8..8b39c006d83b66e4a84232bc44d5288838cb4103:/include/wx/msw/pen.h diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index 719140d8cf..61ce98dfe9 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -38,9 +38,17 @@ protected: int m_cap ; wxBitmap m_stipple ; int m_nbDash ; - wxMSWDash * m_dash ; + wxDash * m_dash ; wxColour m_colour; WXHPEN m_hPen; + +private: +// Cannot use +// DECLARE_NO_COPY_CLASS(wxPenRefData) +// because copy constructor is explicitly declared above; +// but no copy assignment operator is defined, so declare +// it private to prevent the compiler from defining it: + wxPenRefData& operator=(const wxPenRefData&); }; #define M_PENDATA ((wxPenRefData *)m_refData) @@ -57,8 +65,8 @@ public: ~wxPen(); inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; } - inline bool operator == (const wxPen& pen) { return m_refData == pen.m_refData; } - inline bool operator != (const wxPen& pen) { return m_refData != pen.m_refData; } + 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) ; } @@ -89,7 +97,7 @@ public: // Internal bool RealizeResource(); bool FreeResource(bool force = FALSE); - WXHANDLE GetResourceHandle() ; + WXHANDLE GetResourceHandle() const; bool IsFree() const; void Unshare(); };