X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..386a2898e3a55362d30d22adf024b95ce0d5773f:/src/x11/pen.cpp diff --git a/src/x11/pen.cpp b/src/x11/pen.cpp index 1c274eb754..4e8be7e168 100644 --- a/src/x11/pen.cpp +++ b/src/x11/pen.cpp @@ -156,11 +156,11 @@ void wxPen::SetJoin( wxPenJoin joinStyle ) M_PENDATA->m_joinStyle = joinStyle; } -void wxPen::SetStipple( wxBitmap *stipple ) +void wxPen::SetStipple( const wxBitmap& stipple ) { AllocExclusive(); - M_PENDATA->m_stipple = *stipple; + M_PENDATA->m_stipple = stipple; } void wxPen::SetStyle( wxPenStyle style ) @@ -197,21 +197,21 @@ wxDash* wxPen::GetDash() const wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); return M_PENDATA->m_capStyle; } wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); return M_PENDATA->m_joinStyle; } wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } @@ -223,7 +223,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") );