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

added and documented wxRect::Union(); also moved some methods inline

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-11 23:29:55 +00:00
parent c28cb884de
commit df83b840bb
3 changed files with 83 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/gdicmn.cpp
View File

@@ -119,18 +119,6 @@ wxRect::wxRect(const wxPoint& point1, const wxPoint& point2)
height++;
}
wxRect::wxRect(const wxPoint& point, const wxSize& size)
{
x = point.x; y = point.y;
width = size.x; height = size.y;
}
wxRect::wxRect(const wxSize& size)
{
x = 0; y = 0;
width = size.x; height = size.y;
}
bool wxRect::operator==(const wxRect& rect) const
{
return ((x == rect.x) &&
@@ -139,13 +127,7 @@ bool wxRect::operator==(const wxRect& rect) const
(height == rect.height));
}
wxRect& wxRect::operator += (const wxRect& rect)
{
*this = (*this + rect);
return ( *this ) ;
}
wxRect wxRect::operator + (const wxRect& rect) const
wxRect wxRect::operator+(const wxRect& rect) const
{
int x1 = wxMin(this->x, rect.x);
int y1 = wxMin(this->y, rect.y);
@@ -154,6 +136,25 @@ wxRect wxRect::operator + (const wxRect& rect) const
return wxRect(x1, y1, x2-x1, y2-y1);
}
wxRect& wxRect::Union(const wxRect& rect)
{
// ignore empty rectangles
if ( rect.width && rect.height )
{
int x1 = wxMin(x, rect.x);
int y1 = wxMin(y, rect.y);
int y2 = wxMax(y + height, rect.height + rect.y);
int x2 = wxMax(x + width, rect.width + rect.x);
x = x1;
y = y1;
width = x2 - x1;
height = y2 - y1;
}
return *this;
}
wxRect& wxRect::Inflate(wxCoord dx, wxCoord dy)
{
x -= dx;