X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/pen.cpp diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index 7f0acfebe5..5fa47f2a9a 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -19,6 +19,45 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) +class WXDLLEXPORT wxPenRefData : public wxGDIRefData +{ +public: + wxPenRefData(); + wxPenRefData(const wxPenRefData& data); + virtual ~wxPenRefData(); + + wxPenRefData& operator=(const wxPenRefData& data); + + bool operator==(const wxPenRefData& data) const + { + // we intentionally don't compare m_hPen fields here + return m_style == data.m_style && + m_width == data.m_width && + m_join == data.m_join && + m_cap == data.m_cap && + m_colour == data.m_colour && + (m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxUSER_DASH || + (m_nbDash == data.m_nbDash && + memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); + } + +protected: + int m_width; + int m_style; + int m_join ; + int m_cap ; + wxBitmap m_stipple ; + int m_nbDash ; + wxDash * m_dash ; + wxColour m_colour; + /* TODO: implementation + WXHPEN m_hPen; + */ + + friend class WXDLLIMPEXP_FWD_CORE wxPen; +}; + wxPenRefData::wxPenRefData() { m_style = wxSOLID; @@ -47,6 +86,8 @@ wxPenRefData::~wxPenRefData() // Pens +#define M_PENDATA ((wxPenRefData *)m_refData) + wxPen::wxPen() { } @@ -86,6 +127,59 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) RealizeResource(); } +wxGDIRefData *wxPen::CreateGDIRefData() const +{ + return new wxPenRefData; +} + +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxPenRefData(*wx_static_cast(const wxPenRefData *, data)); +} + +bool wxPen::operator==(const wxPen& pen) const +{ + const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; + + // an invalid pen is only equal to another invalid pen + return m_refData ? penData && *M_PENDATA == *penData : !penData; +} + +wxColour& wxPen::GetColour() const +{ + return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); +} + +int wxPen::GetWidth() const +{ + return (M_PENDATA ? M_PENDATA->m_width : 0); +} + +int wxPen::GetStyle() const +{ + return (M_PENDATA ? M_PENDATA->m_style : 0); +} + +int wxPen::GetJoin() const +{ + return (M_PENDATA ? M_PENDATA->m_join : 0); +} + +int wxPen::GetCap() const +{ + return (M_PENDATA ? M_PENDATA->m_cap : 0); +} + +int wxPen::GetDashes(wxDash **ptr) const +{ + *ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL); return (M_PENDATA ? M_PENDATA->m_nbDash : 0); +} + +wxBitmap *wxPen::GetStipple() const +{ + return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); +} + void wxPen::Unshare() { // Don't change shared data