From b93d0c64029048cb3f0e3db00b454dd0ae82a7ef Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 3 Jun 1999 08:45:33 +0000 Subject: [PATCH] min/max -> wxMin/wxMax git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/gdicmn.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index a55bd47e58..53a1a34117 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -31,6 +31,7 @@ #include "wx/palette.h" #include "wx/app.h" #include "wx/dc.h" +#include "wx/utils.h" #include "wx/log.h" #include @@ -96,10 +97,10 @@ const wxRect& wxRect::operator += (const wxRect& rect) wxRect wxRect::operator + (const wxRect& rect) const { - int x1 = min(this->x, rect.x); - int y1 = min(this->y, rect.y); - int y2 = max(y+height, rect.height+rect.y); - int x2 = max(x+width, rect.width+rect.x); + int x1 = wxMin(this->x, rect.x); + int y1 = wxMin(this->y, rect.y); + int y2 = wxMax(y+height, rect.height+rect.y); + int x2 = wxMax(x+width, rect.width+rect.x); return wxRect(x1, y1, x2-x1, y2-y1); } -- 2.45.2