X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..16a6b53ddc74d62fd1b6b82651d0e3859580c48a:/include/wx/os2/pen.h?ds=sidebyside diff --git a/include/wx/os2/pen.h b/include/wx/os2/pen.h index d192842d2c..a036a152a0 100644 --- a/include/wx/os2/pen.h +++ b/include/wx/os2/pen.h @@ -17,11 +17,11 @@ typedef long wxPMDash; -class WXDLLEXPORT wxPen; +class WXDLLIMPEXP_FWD_CORE wxPen; class WXDLLEXPORT wxPenRefData: public wxGDIRefData { - friend class WXDLLEXPORT wxPen; + friend class WXDLLIMPEXP_FWD_CORE wxPen; public: wxPenRefData(); wxPenRefData(const wxPenRefData& rData); @@ -35,8 +35,8 @@ public: m_nJoin == data.m_nJoin && m_nCap == data.m_nCap && m_vColour == data.m_vColour && - (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) && - (m_style != wxUSER_DASH || + (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)); } @@ -72,7 +72,7 @@ public: inline bool operator == (const wxPen& rPen) const { - const wxPenRefData *penData = (wxPenRefData *)pen.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;