wxRect::union and docstring fixes

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

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 37fd6107d0be867ad0c00ebdaf9768288be95c00..a80f17890fdf9c3701f638e4eee032120786fc15 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -485,13 +485,13 @@ public:
     DocDeclStr(
         wxRect&, Inflate(wxCoord dx, wxCoord dy),
         "Increase the rectangle size by dx in x direction and dy in y
     DocDeclStr(
         wxRect&, Inflate(wxCoord dx, wxCoord dy),
         "Increase the rectangle size by dx in x direction and dy in y

-direction. Both or one of) parameters may be negative to decrease the
+direction. Both (or one of) parameters may be negative to decrease the

 rectangle size.", "");
 
     DocDeclStr(
         wxRect&, Deflate(wxCoord dx, wxCoord dy),
         "Decrease the rectangle size by dx in x direction and dy in y
 rectangle size.", "");
 
     DocDeclStr(
         wxRect&, Deflate(wxCoord dx, wxCoord dy),
         "Decrease the rectangle size by dx in x direction and dy in y

-direction. Both or one of) parameters may be negative to increase the
+direction. Both (or one of) parameters may be negative to increase the

 rectngle size. This method is the opposite of Inflate.", "");
 
     DocDeclStrName(
 rectngle size. This method is the opposite of Inflate.", "");
 
     DocDeclStrName(


@@ -506,9 +506,14 @@ bottom, otherwise it is moved to the left or top respectively.", "",
         "Same as OffsetXY but uses dx,dy from Point", "");
 
     DocDeclStr(
         "Same as OffsetXY but uses dx,dy from Point", "");
 
     DocDeclStr(

-        wxRect&, Intersect(const wxRect& rect),
-        "Return the intersectsion of this rectangle and rect.", "");
+        wxRect, Intersect(const wxRect& rect),
+        "Returns the intersectsion of this rectangle and rect.", "");

 
 

+    DocDeclStr(
+        wxRect , Union(const wxRect& rect),
+        "Returns the union of this rectangle and rect.", "");
+    
+    

     DocDeclStr(
         wxRect, operator+(const wxRect& rect) const,
         "Add the properties of rect to this rectangle and return the result.", "");
     DocDeclStr(
         wxRect, operator+(const wxRect& rect) const,
         "Add the properties of rect to this rectangle and return the result.", "");