X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17b1d76b4add82305463d10b9f65668d06169363..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/pen.h diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index 233016dc12..151aef8118 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -27,6 +27,20 @@ public: wxPenRefData(const wxPenRefData& rData); virtual ~wxPenRefData(); + bool operator==(const wxPenRefData& data) const + { + // we intentionally don't compare m_hPen fields here + return m_nStyle == data.m_nStyle && + m_nWidth == data.m_nWidth && + m_nJoin == data.m_nJoin && + m_nCap == data.m_nCap && + m_vColour == data.m_vColour && + (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) && + (m_nStyle != wxUSER_DASH || + (m_dash == data.m_dash && + memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); + } + protected: int m_nWidth; int m_nStyle; @@ -57,9 +71,15 @@ public: virtual ~wxPen(); inline bool operator == (const wxPen& rPen) const - { return m_refData == rPen.m_refData; } + { + const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData; + + // an invalid pen is only equal to another invalid pen + return m_refData ? penData && *M_PENDATA == *penData : !penData; + } + inline bool operator != (const wxPen& rPen) const - { return m_refData != rPen.m_refData; } + { return !(*this == rPen); } virtual bool Ok() const { return IsOk(); } virtual bool IsOk(void) const { return (m_refData != NULL); }