From 972719407b321314ef2c2302b308bbc3f4393480 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 25 Sep 2006 18:18:26 +0000 Subject: [PATCH] compilation fixes after recent changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/regiong.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/generic/regiong.cpp b/src/generic/regiong.cpp index a60937a63c..845df56ce0 100644 --- a/src/generic/regiong.cpp +++ b/src/generic/regiong.cpp @@ -322,19 +322,19 @@ bool wxRegionGeneric::DoUnionWithRect(const wxRect& rect) return REGION::XUnionRegion(®ion,M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::DoUnionWithRegion(const wxRegionGeneric& region) +bool wxRegionGeneric::DoUnionWithRegion(const wxRegion& region) { AllocExclusive(); return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::DoIntersect(const wxRegionGeneric& region) +bool wxRegionGeneric::DoIntersect(const wxRegion& region) { AllocExclusive(); return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::DoSubtract(const wxRegionGeneric& region) +bool wxRegionGeneric::DoSubtract(const wxRegion& region) { if ( region.IsEmpty() ) { @@ -345,7 +345,7 @@ bool wxRegionGeneric::DoSubtract(const wxRegionGeneric& region) return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); } -bool wxRegionGeneric::DoXor(const wxRegionGeneric& region) +bool wxRegionGeneric::DoXor(const wxRegion& region) { AllocExclusive(); return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); @@ -368,7 +368,7 @@ bool wxRegionGeneric::IsEmpty() const } // Does the region contain the point (x,y)? -wxRegionContain wxRegionGeneric::DoContainsPoint(long x, long y) const +wxRegionContain wxRegionGeneric::DoContainsPoint(wxCoord x, wxCoord y) const { wxASSERT(m_refData); return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion; -- 2.45.2