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

The Great wxRegion Refactoring:

Browse Source 
1. added wxRegionBase class and derive all wxRegions from it
2. also added wxRegionWithCombine for the ports providing Combine() method
   (MSW, OS2 and Mac) to reduce code duplication further
3. made sure region comparison works the same way in all ports (except those
   not implementing it) and added IsEqual() method


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-25 11:47:23 +00:00
parent b48f51ca74
commit 8a16d7370e
24 changed files with 751 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
src/x11/region.cpp
View File

@@ -129,13 +129,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
// wxRegion comparison
// ----------------------------------------------------------------------------
bool wxRegion::operator==( const wxRegion& region ) const
bool wxRegion::DoIsEqual(const wxRegion& region) const
{
if (m_refData == region.m_refData) return true;
if (!m_refData || !region.m_refData) return false;
// compare the regions themselves, not the pointers to ref data!
return XEqualRegion( M_REGIONDATA->m_region,
M_REGIONDATA_OF(region)->m_region ) == True;
}
@@ -149,45 +144,38 @@ void wxRegion::Clear()
UnRef();
}
bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::DoUnionWithRect(const wxRect& r)
{
// work around for XUnionRectWithRegion() bug: taking a union with an empty
// rect results in an empty region (at least XFree 3.3.6 and 4.0 have this
// problem)
if ( !width || !height )
if ( r.IsEmpty() )
return true;
XRectangle rect;
rect.x = (short)x;
rect.y = (short)y;
rect.width = (unsigned short)width;
rect.height = (unsigned short)height;
rect.x = (short)r.x;
rect.y = (short)r.y;
rect.width = (unsigned short)r.width;
rect.height = (unsigned short)r.height;
if (!m_refData)
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = XCreateRegion();
XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
}
else
{
AllocExclusive();
XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
}
XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
return true;
}
bool wxRegion::Union( const wxRect& rect )
bool wxRegion::DoUnionWithRegion( const wxRegion& region )
{
return Union( rect.x, rect.y, rect.width, rect.height );
}
bool wxRegion::Union( const wxRegion& region )
{
if (region.IsNull())
return false;
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
@@ -206,24 +194,9 @@ bool wxRegion::Union( const wxRegion& region )
return true;
}
bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::DoIntersect( const wxRegion& region )
{
wxRegion reg( x, y, width, height );
return Intersect( reg );
}
bool wxRegion::Intersect( const wxRect& rect )
{
wxRegion reg( rect );
return Intersect( reg );
}
bool wxRegion::Intersect( const wxRegion& region )
{
if (region.IsNull())
return false;
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
@@ -245,22 +218,9 @@ bool wxRegion::Intersect( const wxRegion& region )
return true;
}
bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::DoSubtract( const wxRegion& region )
{
wxRegion reg( x, y, width, height );
return Subtract( reg );
}
bool wxRegion::Subtract( const wxRect& rect )
{
wxRegion reg( rect );
return Subtract( reg );
}
bool wxRegion::Subtract( const wxRegion& region )
{
if (region.IsNull())
return false;
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
@@ -279,22 +239,9 @@ bool wxRegion::Subtract( const wxRegion& region )
return true;
}
bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::DoXor( const wxRegion& region )
{
wxRegion reg( x, y, width, height );
return Xor( reg );
}
bool wxRegion::Xor( const wxRect& rect )
{
wxRegion reg( rect );
return Xor( reg );
}
bool wxRegion::Xor( const wxRegion& region )
{
if (region.IsNull())
return false;
wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
if (!m_refData)
{
@@ -317,7 +264,7 @@ bool wxRegion::Xor( const wxRegion& region )
// wxRegion tests
// ----------------------------------------------------------------------------
void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
{
if (m_refData)
{
@@ -327,6 +274,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
y = rect.y;
w = rect.width;
h = rect.height;
return true;
}
else
{
@@ -334,17 +283,12 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
y = 0;
w = -1;
h = -1;
return false;
}
}
wxRect wxRegion::GetBox() const
{
wxCoord x, y, w, h;
GetBox( x, y, w, h );
return wxRect( x, y, w, h );
}
bool wxRegion::Offset( wxCoord x, wxCoord y )
bool wxRegion::DoOffset( wxCoord x, wxCoord y )
{
if (!m_refData)
return false;
@@ -356,7 +300,7 @@ bool wxRegion::Offset( wxCoord x, wxCoord y )
return true;
}
bool wxRegion::Empty() const
bool wxRegion::IsEmpty() const
{
if (!m_refData)
return true;
@@ -364,7 +308,7 @@ bool wxRegion::Empty() const
return XEmptyRegion( M_REGIONDATA->m_region ) == True;
}
wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const
{
if (!m_refData)
return wxOutRegion;
@@ -375,12 +319,12 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
return wxOutRegion;
}
wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const
{
if (!m_refData)
return wxOutRegion;
int res = XRectInRegion( M_REGIONDATA->m_region, x, y, w, h );
int res = XRectInRegion(M_REGIONDATA->m_region, r.x, r.y, r.width, r.height);
switch (res)
{
case RectangleIn: return wxInRegion;
@@ -390,16 +334,6 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
return wxOutRegion;
}
wxRegionContain wxRegion::Contains(const wxPoint& pt) const
{
return Contains( pt.x, pt.y );
}
wxRegionContain wxRegion::Contains(const wxRect& rect) const
{
return Contains( rect.x, rect.y, rect.width, rect.height );
}
WXRegion *wxRegion::GetX11Region() const
{
if (!m_refData)