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

min/max -> wxMin/wxMax

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-06-03 08:45:33 +00:00
parent 5bdc3b1d4a
commit b93d0c6402
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/gdicmn.cpp
View File

@@ -31,6 +31,7 @@
#include "wx/palette.h" #include "wx/palette.h"
#include "wx/app.h" #include "wx/app.h"
#include "wx/dc.h" #include "wx/dc.h"
#include "wx/utils.h"
#include "wx/log.h" #include "wx/log.h"
#include <string.h> #include <string.h>
@@ -96,10 +97,10 @@ const wxRect& wxRect::operator += (const wxRect& rect)
wxRect wxRect::operator + (const wxRect& rect) const wxRect wxRect::operator + (const wxRect& rect) const
{ {
int x1 = min(this->x, rect.x); int x1 = wxMin(this->x, rect.x);
int y1 = min(this->y, rect.y); int y1 = wxMin(this->y, rect.y);
int y2 = max(y+height, rect.height+rect.y); int y2 = wxMax(y+height, rect.height+rect.y);
int x2 = max(x+width, rect.width+rect.x); int x2 = wxMax(x+width, rect.width+rect.x);
return wxRect(x1, y1, x2-x1, y2-y1); return wxRect(x1, y1, x2-x1, y2-y1);
} }