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

fixed Union() for the case of this rectangle being empty

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-12-12 19:00:42 +00:00
parent 8a8dcc3421
commit c71ce67511
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/gdicmn.cpp
View File

@@ -138,8 +138,13 @@ wxRect wxRect::operator+(const wxRect& rect) const
wxRect& wxRect::Union(const wxRect& rect) wxRect& wxRect::Union(const wxRect& rect)
{ {
// ignore empty rectangles // ignore empty rectangles: union with an empty rectangle shouldn't extend
if ( rect.width && rect.height ) // this one to (0, 0)
if ( !width || !height )
{
*this = rect;
}
else if ( rect.width && rect.height )
{ {
int x1 = wxMin(x, rect.x); int x1 = wxMin(x, rect.x);
int y1 = wxMin(y, rect.y); int y1 = wxMin(y, rect.y);
@@ -151,6 +156,7 @@ wxRect& wxRect::Union(const wxRect& rect)
width = x2 - x1; width = x2 - x1;
height = y2 - y1; height = y2 - y1;
} }
//else: we're not empty and rect is empty
return *this; return *this;
} }