X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/dfb/brush.cpp?ds=sidebyside diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp index efbd60cbbc..620a04aed9 100644 --- a/src/dfb/brush.cpp +++ b/src/dfb/brush.cpp @@ -48,7 +48,7 @@ public: if ( style != wxSOLID && style != wxTRANSPARENT ) { wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") ); - style = wxSOLID; + style = wxBRUSHSTYLE_SOLID; } m_style = style; @@ -91,14 +91,14 @@ bool wxBrush::operator==(const wxBrush& brush) const wxBrushStyle wxBrush::GetStyle() const { - wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") ); + wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") ); return M_BRUSHDATA->m_style; } -wxColour& wxBrush::GetColour() const +wxColour wxBrush::GetColour() const { - wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; }