X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/231b9591aac1d6a507aa1ecfeb5f57e720003391..2e14066008229145e2da7b9f05a478ce38631f83:/src/mgl/brush.cpp diff --git a/src/mgl/brush.cpp b/src/mgl/brush.cpp index c5f2b03cc0..a00c6ec8b6 100644 --- a/src/mgl/brush.cpp +++ b/src/mgl/brush.cpp @@ -144,9 +144,9 @@ wxBrush::wxBrush(const wxColour& col, int style) wxBrush::wxBrush(const wxBitmap &stippleBitmap) { - wxCHECK_RET( stippleBitmap.Ok(), _T("invalid bitmap") ); + wxCHECK_RET( stippleBitmap.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stippleBitmap.GetWidth() == 8 && stippleBitmap.GetHeight() == 8, - _T("stipple bitmap must be 8x8") ); + wxT("stipple bitmap must be 8x8") ); m_refData = new wxBrushRefData(); M_BRUSHDATA->m_colour = *wxBLACK; @@ -177,35 +177,35 @@ 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 { - wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") ); + wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") ); return M_BRUSHDATA->m_colour; } wxBitmap *wxBrush::GetStipple() const { - wxCHECK_MSG( Ok(), NULL, _T("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return &M_BRUSHDATA->m_stipple; } void* wxBrush::GetMaskPattern() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return (void*)&(M_BRUSHDATA->m_maskPattern); } void* wxBrush::GetPixPattern() const { - wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") ); return (void*)&(M_BRUSHDATA->m_pixPattern); } @@ -232,9 +232,9 @@ void wxBrush::SetStipple(const wxBitmap& stipple) { AllocExclusive(); - wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") ); + wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") ); wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8, - _T("stipple bitmap must be 8x8") ); + wxT("stipple bitmap must be 8x8") ); M_BRUSHDATA->m_stipple = stipple; wxBitmapToPixPattern(stipple, &(M_BRUSHDATA->m_pixPattern),