X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46623e91bbe22b55bf8d8142be29da1e7e4867e8..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/pen.cpp?ds=sidebyside diff --git a/src/mac/carbon/pen.cpp b/src/mac/carbon/pen.cpp index d0644b2468..fac1abae27 100644 --- a/src/mac/carbon/pen.cpp +++ b/src/mac/carbon/pen.cpp @@ -19,9 +19,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject) -class WXDLLEXPORT wxPenRefData: public wxGDIRefData +class WXDLLEXPORT wxPenRefData : public wxGDIRefData { - friend class WXDLLIMPEXP_FWD_CORE wxPen; public: wxPenRefData(); wxPenRefData(const wxPenRefData& data); @@ -33,28 +32,30 @@ public: { // 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)); + 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; -*/ + int m_width; + wxPenStyle m_style; + wxPenJoin m_join ; + wxPenCap 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() @@ -96,7 +97,7 @@ wxPen::~wxPen() } // Should implement Create -wxPen::wxPen(const wxColour& col, int Width, int Style) +wxPen::wxPen(const wxColour& col, int Width, wxPenStyle Style) { m_refData = new wxPenRefData; @@ -111,6 +112,21 @@ wxPen::wxPen(const wxColour& col, int Width, int Style) RealizeResource(); } +wxPen::wxPen(const wxColour& col, int Width, wxBrushStyle Style) +{ + m_refData = new wxPenRefData; + + M_PENDATA->m_colour = col; + M_PENDATA->m_width = Width; + M_PENDATA->m_style = (wxPenStyle)Style; + M_PENDATA->m_join = wxJOIN_ROUND ; + M_PENDATA->m_cap = wxCAP_ROUND ; + M_PENDATA->m_nbDash = 0 ; + M_PENDATA->m_dash = 0 ; + + RealizeResource(); +} + wxPen::wxPen(const wxBitmap& stipple, int Width) { m_refData = new wxPenRefData; @@ -126,7 +142,17 @@ wxPen::wxPen(const wxBitmap& stipple, int Width) RealizeResource(); } -bool wxPen::operator == (const wxPen& pen) const +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; @@ -134,39 +160,39 @@ bool wxPen::operator == (const wxPen& pen) const return m_refData ? penData && *M_PENDATA == *penData : !penData; } -wxColour& wxPen::GetColour() const -{ - return (M_PENDATA ? M_PENDATA->m_colour : wxNullColour); +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::GetWidth() const +{ + return (M_PENDATA ? M_PENDATA->m_width : 0); } -int wxPen::GetStyle() const -{ - return (M_PENDATA ? M_PENDATA->m_style : 0); +wxPenStyle wxPen::GetStyle() const +{ + return (M_PENDATA ? M_PENDATA->m_style : 0); } -int wxPen::GetJoin() const -{ - return (M_PENDATA ? M_PENDATA->m_join : 0); +wxPenJoin wxPen::GetJoin() const +{ + return (M_PENDATA ? M_PENDATA->m_join : 0); } -int wxPen::GetCap() const -{ - return (M_PENDATA ? M_PENDATA->m_cap : 0); +wxPenCap wxPen::GetCap() const +{ + return (M_PENDATA ? M_PENDATA->m_cap : 0); } -int wxPen::GetDashes(wxDash **ptr) const +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); +wxBitmap *wxPen::GetStipple() const +{ + return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); } void wxPen::Unshare() @@ -211,7 +237,7 @@ void wxPen::SetWidth(int Width) RealizeResource(); } -void wxPen::SetStyle(int Style) +void wxPen::SetStyle(wxPenStyle Style) { Unshare(); @@ -240,7 +266,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash) RealizeResource(); } -void wxPen::SetJoin(int Join) +void wxPen::SetJoin(wxPenJoin Join) { Unshare(); @@ -249,7 +275,7 @@ void wxPen::SetJoin(int Join) RealizeResource(); } -void wxPen::SetCap(int Cap) +void wxPen::SetCap(wxPenCap Cap) { Unshare();