X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..815f65bd0f673965230ed915d794497a8818dd35:/src/dfb/region.cpp?ds=sidebyside diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp index a69c046869..7a2cb28b7d 100644 --- a/src/dfb/region.cpp +++ b/src/dfb/region.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mgl/region.cpp +// Name: src/dfb/region.cpp // Purpose: Region handling for wxWidgets/DFB // Author: Vaclav Slavik // Created: 2006-08-08 @@ -45,12 +45,12 @@ public: // wxRegion //----------------------------------------------------------------------------- -wxObjectRefData *wxRegion::CreateRefData() const +wxGDIRefData *wxRegion::CreateGDIRefData() const { return new wxRegionRefData; } -wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { return new wxRegionRefData(*(wxRegionRefData *)data); } @@ -142,20 +142,20 @@ bool wxRegion::DoUnionWithRect(const wxRect& rect) } else { - wxFAIL_MSG( _T("only rectangular regions are supported") ); + wxFAIL_MSG( "only rectangular regions are supported" ); return false; } } bool wxRegion::DoUnionWithRegion(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); return DoUnionWithRect(M_REGION_OF(region)->m_rect); } bool wxRegion::DoIntersect(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); AllocExclusive(); M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect); @@ -164,8 +164,8 @@ bool wxRegion::DoIntersect(const wxRegion& region) bool wxRegion::DoSubtract(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - wxCHECK_MSG( Ok(), false, _T("invalid region") ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); + wxCHECK_MSG( IsOk(), false, "invalid region" ); const wxRect& rect = M_REGION_OF(region)->m_rect; @@ -183,15 +183,15 @@ bool wxRegion::DoSubtract(const wxRegion& region) } else { - wxFAIL_MSG( _T("only rectangular regions implemented") ); + wxFAIL_MSG( "only rectangular regions implemented" ); return false; } } bool wxRegion::DoXor(const wxRegion& region) { - wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); - wxFAIL_MSG( _T("Xor not implemented") ); + wxCHECK_MSG( region.IsOk(), false, "invalid region" ); + wxFAIL_MSG( "Xor not implemented" ); return false; } @@ -202,7 +202,7 @@ bool wxRegion::DoXor(const wxRegion& region) wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const { - wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); + wxCHECK_MSG( IsOk(), wxOutRegion, "invalid region" ); if (M_REGION->m_rect.Contains(x, y)) return wxInRegion; @@ -212,7 +212,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const { - wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") ); + wxCHECK_MSG( IsOk(), wxOutRegion, "invalid region" ); // 1) is the rectangle entirely covered by the region? if (M_REGION->m_rect.Contains(rect))