VC++ 5 compatibility

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index ff1c1a722b483e6db04c2daf93d5b969d564f596..10e7b6b5ee7b10395f5d5b014cc6a16109d39075 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -319,8 +319,12 @@ public:
         : x(xx), y(yy), width(ww), height(hh)
         { }
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);
         : x(xx), y(yy), width(ww), height(hh)
         { }
     wxRect(const wxPoint& topLeft, const wxPoint& bottomRight);

-    wxRect(const wxPoint& pos, const wxSize& size);
-    wxRect(const wxSize& size);
+    wxRect(const wxPoint& pt, const wxSize& size)
+        : x(pt.x), y(pt.y), width(size.x), height(size.y)
+        { }
+    wxRect(const wxSize& size)
+        : x(0), y(0), width(size.x), height(size.y)
+        { }

 
     // default copy ctor and assignment operators ok
 
 
     // default copy ctor and assignment operators ok
 


@@ -392,8 +396,13 @@ public:
         return r;
     }
 
         return r;
     }
 

-    wxRect operator+(const wxRect& rect) const;
-    wxRect& operator+=(const wxRect& rect);
+    wxRect& Union(const wxRect& rect);
+    wxRect Union(const wxRect& rect) const
+    {
+        wxRect r = *this;
+        r.Union(rect);
+        return r;
+    }

 
     // compare rectangles
     bool operator==(const wxRect& rect) const;
 
     // compare rectangles
     bool operator==(const wxRect& rect) const;


@@ -406,6 +415,16 @@ public:
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 
     // return true if the rectangles have a non empty intersection
     bool Intersects(const wxRect& rect) const;
 

+
+    // these are like Union() but don't ignore empty rectangles
+    wxRect operator+(const wxRect& rect) const;
+    wxRect& operator+=(const wxRect& rect)
+    {
+        *this = *this + rect;
+        return *this;
+    }
+
+

 public:
     int x, y, width, height;
 };
 public:
     int x, y, width, height;
 };