if ( style != wxSOLID && style != wxTRANSPARENT )
{
wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
- style = wxSOLID;
+ style = wxBRUSHSTYLE_SOLID;
}
m_style = style;
bool wxBrush::operator==(const wxBrush& brush) const
{
-#warning "this is incorrect (MGL too)"
+#warning "this is incorrect"
return m_refData == brush.m_refData;
}
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;
}