just to resolve a dummy conflict

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 4a7784f0b4b3ecf2529d78f307c921df3f70531b..53a1a341179f67e18adf3522870d13c7d893f3c7 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -30,6 +30,8 @@
 #include "wx/font.h"
 #include "wx/palette.h"
 #include "wx/app.h"
+#include "wx/dc.h"
+#include "wx/utils.h"
 
 #include "wx/log.h"
 #include <string.h>
@@ -87,6 +89,29 @@ bool wxRect::operator==(const wxRect& rect) const
           (height == rect.height));
 }
 
+const wxRect& wxRect::operator += (const wxRect& rect)
+{ 
+       *this = (*this + rect); 
+       return ( *this ) ;
+}
+
+wxRect wxRect::operator + (const wxRect& rect) const
+{ 
+       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);
+}
+
+bool wxRect::Inside(int cx, int cy) const
+{
+       return ( (cx >= x) && (cy >= y)
+                 && ((cy - y) < height)
+                 && ((cx - x) < width)
+                 );
+}
+
 wxColourDatabase::wxColourDatabase (int type) : wxList (type)
 {
 }