min/max -> wxMin/wxMax

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index a55bd47e58c911863ddf3cf97e90f8154e732f67..53a1a341179f67e18adf3522870d13c7d893f3c7 100644 (file)
--- 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/palette.h"
 #include "wx/app.h"
 #include "wx/dc.h"

+#include "wx/utils.h"

 
 #include "wx/log.h"
 #include <string.h>
 
 #include "wx/log.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 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);
 }
 
        return wxRect(x1, y1, x2-x1, y2-y1);
 }