X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..36090ae57eff3e53cd74f504aaaa727b3bdb6ac8:/src/dfb/pen.cpp?ds=inline diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp index c71488b587..336c8452ef 100644 --- a/src/dfb/pen.cpp +++ b/src/dfb/pen.cpp @@ -40,7 +40,7 @@ public: virtual bool IsOk() const { return m_colour.IsOk(); } - void SetStyle(int style) + void SetStyle(wxPenStyle style) { if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT ) { @@ -84,7 +84,7 @@ wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width)) bool wxPen::operator==(const wxPen& pen) const { -#warning "this is incorrect (MGL too)" +#warning "this is incorrect" return m_refData == pen.m_refData; } @@ -155,7 +155,7 @@ wxDash* wxPen::GetDash() const wxPenCap wxPen::GetCap() const { - wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") ); wxFAIL_MSG( "GetCap not implemented" ); return wxCAP_INVALID; @@ -163,7 +163,7 @@ wxPenCap wxPen::GetCap() const wxPenJoin wxPen::GetJoin() const { - wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") ); wxFAIL_MSG( "GetJoin not implemented" ); return wxJOIN_INVALID; @@ -171,28 +171,28 @@ wxPenJoin wxPen::GetJoin() const wxPenStyle wxPen::GetStyle() const { - wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") ); return M_PENDATA->m_style; } int wxPen::GetWidth() const { - wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") ); return 1; } -wxColour &wxPen::GetColour() const +wxColour wxPen::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") ); return M_PENDATA->m_colour; } wxBitmap *wxPen::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") ); wxFAIL_MSG( "GetStipple not implemented" ); return NULL;