X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..893bf460693cc0af39da7211dad96c3b62fded08:/src/mgl/pen.cpp diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp index 5879052da5..10af321572 100644 --- a/src/mgl/pen.cpp +++ b/src/mgl/pen.cpp @@ -29,42 +29,43 @@ class wxPenRefData: public wxObjectRefData { - public: - wxPenRefData(); - wxPenRefData(const wxPenRefData& data); +public: + wxPenRefData(); + wxPenRefData(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_pixPattern == data.m_pixPattern && + memcmp(&m_pixPattern, + &data.m_pixPattern, sizeof(m_pixPattern)) == 0 && m_capStyle == data.m_capStyle && m_joinStyle == data.m_joinStyle && m_colour == data.m_colour && - (m_style != wxSTIPPLE || m_stipple.IsRefTo(&data.m_stipple)) && - (m_style != wxUSER_DASH || + (m_style != wxPENSTYLE_STIPPLE || m_stipple.IsSameAs(data.m_stipple)) && + (m_style != wxPENSTYLE_USER_DASH || (m_dash == data.m_dash && memcmp(m_dash, data.m_dash, m_countDashes*sizeof(wxDash)) == 0)); } - int m_width; - int m_style; - wxColour m_colour; - wxBitmap m_stipple; - pixpattern24_t m_pixPattern; - - // not used by wxMGL, but we want to preserve values - int m_joinStyle; - int m_capStyle; - int m_countDashes; - wxDash *m_dash; + int m_width; + wxPenStyle m_style; + wxColour m_colour; + wxBitmap m_stipple; + pixpattern24_t m_pixPattern; + + // not used by wxMGL, but we want to preserve values + wxPenJoin m_joinStyle; + wxPenCap m_capStyle; + int m_countDashes; + wxDash *m_dash; }; wxPenRefData::wxPenRefData() { m_width = 1; - m_style = wxSOLID; + m_style = wxPENSTYLE_SOLID; m_joinStyle = wxJOIN_ROUND; m_capStyle = wxCAP_ROUND; m_dash = (wxDash*) NULL; @@ -101,7 +102,7 @@ wxPenRefData::wxPenRefData(const wxPenRefData& data) IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject) -wxPen::wxPen(const wxColour &colour, int width, int style) +wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style) { m_refData = new wxPenRefData(); M_PENDATA->m_width = width; @@ -109,6 +110,16 @@ wxPen::wxPen(const wxColour &colour, int width, int style) M_PENDATA->m_colour = colour; } +#if FUTURE_WXWIN_COMPATIBILITY_3_0 +wxPen::wxPen(const wxColour& colour, int width, int style) +{ + m_refData = new wxPenRefData(); + M_PENDATA->m_width = width; + M_PENDATA->m_style = (wxPenStyle)style; + M_PENDATA->m_colour = colour; +} +#endif + wxPen::wxPen(const wxBitmap& stipple, int width) { wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); @@ -117,7 +128,7 @@ wxPen::wxPen(const wxBitmap& stipple, int width) m_refData = new wxPenRefData(); M_PENDATA->m_width = width; - M_PENDATA->m_style = wxSTIPPLE; + M_PENDATA->m_style = wxPENSTYLE_STIPPLE; M_PENDATA->m_stipple = stipple; wxBitmapToPixPattern(stipple, &(M_PENDATA->m_pixPattern), NULL); } @@ -155,19 +166,19 @@ void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue M_PENDATA->m_colour.Set(red, green, blue); } -void wxPen::SetCap(int capStyle) +void wxPen::SetCap(wxPenCap capStyle) { AllocExclusive(); M_PENDATA->m_capStyle = capStyle; } -void wxPen::SetJoin(int joinStyle) +void wxPen::SetJoin(wxPenJoin joinStyle) { AllocExclusive(); M_PENDATA->m_joinStyle = joinStyle; } -void wxPen::SetStyle(int style) +void wxPen::SetStyle(wxPenStyle style) { AllocExclusive(); M_PENDATA->m_style = style; @@ -192,35 +203,41 @@ void wxPen::SetWidth(int width) int wxPen::GetDashes(wxDash **ptr) const { - *ptr = (M_PENDATA ? (wxDash*)M_PENDATA->m_dash : (wxDash*) NULL); - return (M_PENDATA ? M_PENDATA->m_countDashes : 0); + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + + *ptr = (wxDash*)M_PENDATA->m_dash; + return M_PENDATA->m_countDashes; } int wxPen::GetDashCount() const { + wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + return (M_PENDATA->m_countDashes); } wxDash* wxPen::GetDash() const { + wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + return (wxDash*)M_PENDATA->m_dash; } -int wxPen::GetCap() const +wxPenCap wxPen::GetCap() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } -int wxPen::GetJoin() const +wxPenJoin wxPen::GetJoin() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } -int wxPen::GetStyle() const +wxPenStyle wxPen::GetStyle() const { wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); @@ -234,7 +251,7 @@ int wxPen::GetWidth() const return M_PENDATA->m_width; } -wxColour &wxPen::GetColour() const +wxColour wxPen::GetColour() const { wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); @@ -256,17 +273,12 @@ void* wxPen::GetPixPattern() const } -bool wxPen::IsOk() const -{ - return (m_refData != NULL); -} - -wxObjectRefData *wxPen::CreateRefData() const +wxGDIRefData *wxPen::CreateGDIRefData() const { return new wxPenRefData; } -wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const { return new wxPenRefData(*(wxPenRefData *)data); }