Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes after recent changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-25 18:18:26 +00:00
parent 325125ba4f
commit 972719407b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/regiong.cpp
View File

@@ -322,19 +322,19 @@ bool wxRegionGeneric::DoUnionWithRect(const wxRect& rect)
return REGION::XUnionRegion(&region,M_REGIONDATA,M_REGIONDATA); return REGION::XUnionRegion(&region,M_REGIONDATA,M_REGIONDATA);
} }
bool wxRegionGeneric::DoUnionWithRegion(const wxRegionGeneric& region) bool wxRegionGeneric::DoUnionWithRegion(const wxRegion& region)
{ {
AllocExclusive(); AllocExclusive();
return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); return REGION::XUnionRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
} }
bool wxRegionGeneric::DoIntersect(const wxRegionGeneric& region) bool wxRegionGeneric::DoIntersect(const wxRegion& region)
{ {
AllocExclusive(); AllocExclusive();
return REGION::XIntersectRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); 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() ) if ( region.IsEmpty() )
{ {
@@ -345,7 +345,7 @@ bool wxRegionGeneric::DoSubtract(const wxRegionGeneric& region)
return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); return REGION::XSubtractRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA);
} }
bool wxRegionGeneric::DoXor(const wxRegionGeneric& region) bool wxRegionGeneric::DoXor(const wxRegion& region)
{ {
AllocExclusive(); AllocExclusive();
return REGION::XXorRegion(M_REGIONDATA_OF(region),M_REGIONDATA,M_REGIONDATA); 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)? // 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); wxASSERT(m_refData);
return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion; return REGION::XPointInRegion(M_REGIONDATA,x,y) ? wxInRegion : wxOutRegion;