Added default values for some parameters

[wxWidgets.git] / wxPython / src / _gdicmn.i

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 860d306be4f420bd90c043ce48a8aabe8b9a53b0..a80f17890fdf9c3701f638e4eee032120786fc15 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -132,8 +132,8 @@ public:
 
 // None/NULL is now handled properly by the typemap, so these are not needed.
 //     %extend {
 
 // None/NULL is now handled properly by the typemap, so these are not needed.
 //     %extend {

-//         bool __eq__(const wxSize* other) { return other ? (*self == *other) : False; }
-//         bool __ne__(const wxSize* other) { return other ? (*self != *other) : True;  }
+//         bool __eq__(const wxSize* other) { return other ? (*self == *other) : false; }
+//         bool __ne__(const wxSize* other) { return other ? (*self != *other) : true;  }

 //     }
 
     DocDeclStr(
 //     }
 
     DocDeclStr(


@@ -427,7 +427,12 @@ public:
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);

-    
+
+    DocCtorStrName(
+        wxRect(const wxSize& size),
+        "Create a new Rect from a size only.", "",
+         RectS);
+

     ~wxRect();
 
     int GetX() const;
     ~wxRect();
 
     int GetX() const;


@@ -480,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(


@@ -501,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.", "");


@@ -576,6 +586,8 @@ bottom, otherwise it is moved to the left or top respectively.", "",
 };
 
 
 };
 
 

+MustHaveApp(wxIntersectRect);
+

 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",
        "Calculate and return the intersection of r1 and r2.", "");
 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",
        "Calculate and return the intersection of r1 and r2.", "");


@@ -592,7 +604,7 @@ DocAStr(wxIntersectRect,
         if (dest != wxRect(0,0,0,0)) {
             bool blocked = wxPyBeginBlockThreads();
             wxRect* newRect = new wxRect(dest);
         if (dest != wxRect(0,0,0,0)) {
             bool blocked = wxPyBeginBlockThreads();
             wxRect* newRect = new wxRect(dest);

-            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True);
+            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true);

             wxPyEndBlockThreads(blocked);
             return obj;
         }
             wxPyEndBlockThreads(blocked);
             return obj;
         }