X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8546a549614d7bc09db28653ab7dd834634e72fa..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_gdicmn.i?ds=sidebyside

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index f819bd50d8..b887d2e0aa 100644
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -176,6 +176,21 @@ than the corresponding dimensions of the size.", "");
         "Decrements this object so that both of its dimensions are not greater
 than the corresponding dimensions of the size.", "");
 
+
+    DocDeclStr(
+        void , IncBy(int dx, int dy),
+        "", "");
+    
+
+    DocDeclStr(
+        void , DecBy(int dx, int dy),
+        "", "");
+    
+// TODO: handle these overloads too?    
+//     void IncBy(const wxSize& sz);
+//     void IncBy(int d);
+//     void DecBy(const wxSize& sz);
+//     void DecBy(int d);
     
     DocDeclStr(
         void , Scale(float xscale, float yscale),
@@ -516,10 +531,19 @@ public:
     wxPoint GetBottomRight() const;
     void SetBottomRight(const wxPoint &p);
 
+    wxPoint GetTopRight() const;
+    void SetTopRight(const wxPoint &p);
+    wxPoint GetBottomLeft() const;
+    void SetBottomLeft(const wxPoint &p);
+    
 //    wxPoint GetLeftTop() const;
 //    void SetLeftTop(const wxPoint &p);
 //    wxPoint GetRightBottom() const;
 //    void SetRightBottom(const wxPoint &p);
+//    wxPoint GetRightTop() const;
+//    void SetRightTop(const wxPoint &p);
+//    wxPoint GetLeftBottom() const;
+//    void SetLeftBottom(const wxPoint &p);
 
     int GetLeft()   const;
     int GetTop()    const;
@@ -540,6 +564,7 @@ public:
         bottom = property(GetBottom, SetBottom)
     }
 
+
     DocDeclStr(
         wxRect&, Inflate(wxCoord dx, wxCoord dy),
         "Increases the size of the rectangle.
@@ -582,12 +607,21 @@ that means:
 :see: `Deflate`
 ");
 
+    // There are also these versions...
+    //wxRect& Inflate(const wxSize& d);
+    //wxRect& Inflate(wxCoord d);
+
+    
     DocDeclStr(
         wxRect&, Deflate(wxCoord dx, wxCoord dy),
         "Decrease the rectangle size. This method is the opposite of `Inflate`
 in that Deflate(a,b) is equivalent to Inflate(-a,-b).  Please refer to
 `Inflate` for a full description.", "");
 
+    // There are also these versions...
+    //wxRect& Deflate(const wxSize& d) { return Inflate(-d.x, -d.y); }
+    //wxRect& Deflate(wxCoord d) { return Inflate(-d); }
+
     DocDeclStrName(
         void, Offset(wxCoord dx, wxCoord dy),
         "Moves the rectangle by the specified offset. If dx is positive, the
@@ -653,10 +687,14 @@ bottom, otherwise it is moved to the left or top respectively.", "",
         "Returns ``True`` if the given rectangle is completely inside this
 rectangle or touches its boundary.", "",
         ContainsRect);
+    
     %pythoncode {
-        Inside = wx._deprecated(Contains, "Use `Contains` instead.")
-        InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.")
-        InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.")
+        %#Inside = wx._deprecated(Contains, "Use `Contains` instead.")
+        %#InsideXY = wx._deprecated(ContainsXY, "Use `ContainsXY` instead.")
+        %#InsideRect = wx._deprecated(ContainsRect, "Use `ContainsRect` instead.")
+        Inside = Contains
+        InsideXY = ContainsXY
+        InsideRect = ContainsRect
     }
     
     DocDeclStr(    
@@ -717,6 +755,7 @@ usually, but not necessarily, the larger one.", "");
     
     %property(Bottom, GetBottom, SetBottom, doc="See `GetBottom` and `SetBottom`");
     %property(BottomRight, GetBottomRight, SetBottomRight, doc="See `GetBottomRight` and `SetBottomRight`");
+    %property(BottomLeft, GetBottomLeft, SetBottomLeft, doc="See `GetBottomLeft` and `SetBottomLeft`");
     %property(Height, GetHeight, SetHeight, doc="See `GetHeight` and `SetHeight`");
     %property(Left, GetLeft, SetLeft, doc="See `GetLeft` and `SetLeft`");
     %property(Position, GetPosition, SetPosition, doc="See `GetPosition` and `SetPosition`");
@@ -724,6 +763,7 @@ usually, but not necessarily, the larger one.", "");
     %property(Size, GetSize, SetSize, doc="See `GetSize` and `SetSize`");
     %property(Top, GetTop, SetTop, doc="See `GetTop` and `SetTop`");
     %property(TopLeft, GetTopLeft, SetTopLeft, doc="See `GetTopLeft` and `SetTopLeft`");
+    %property(TopRight, GetTopRight, SetTopRight, doc="See `GetTopRight` and `SetTopRight`");
     %property(Width, GetWidth, SetWidth, doc="See `GetWidth` and `SetWidth`");
     %property(X, GetX, SetX, doc="See `GetX` and `SetX`");
     %property(Y, GetY, SetY, doc="See `GetY` and `SetY`");
@@ -775,6 +815,8 @@ public:
     %RenameCtor(Point2DCopy, wxPoint2D( const wxPoint2D &pt ));
     %RenameCtor(Point2DFromPoint, wxPoint2D( const wxPoint &pt ));
 
+    ~wxPoint2D();
+    
     DocDeclAStr(
         void, GetFloor( int *OUTPUT , int *OUTPUT ) const,
         "GetFloor() -> (x,y)",