added a test to check how exception handling works with Win32 SEH; corrected copyright

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

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 37fd6107d0be867ad0c00ebdaf9768288be95c00..5b62dd38d22b943b18de31c090dc128cc914ac90 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -113,15 +113,15 @@ enum wxStockCursor
 
 DocStr( wxSize,
 "wx.Size is a useful data structure used to represent the size of
 
 DocStr( wxSize,
 "wx.Size is a useful data structure used to represent the size of

-something.  It simply contians integer width and height proprtites.
-In most places in wxPython where a wx.Size is expected a
-(width,height) tuple can be used instead.", "");
+something.  It simply contians integer width and height
+proprtites.  In most places in wxPython where a wx.Size is
+expected a (width, height) tuple can be used instead.", "");

 
 class wxSize
 {
 public:
 
 class wxSize
 {
 public:

-    %name(width) int x;
-    %name(height)int y;
+    %Rename(width, int,  x);
+    %Rename(height,int,  y);

     %pythoncode { x = width; y = height }
     
     DocCtorStr(
     %pythoncode { x = width; y = height }
     
     DocCtorStr(


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


@@ -527,7 +532,7 @@ bottom, otherwise it is moved to the left or top respectively.", "",
 
     
     DocStr( Inside, "Return True if the point is (not strcitly) inside the rect.", "");
 
     
     DocStr( Inside, "Return True if the point is (not strcitly) inside the rect.", "");

-    %name(InsideXY)bool Inside(int x, int y) const;
+    %Rename(InsideXY, bool, Inside(int x, int y) const);

     bool Inside(const wxPoint& pt) const;
 
     DocDeclStr(    
     bool Inside(const wxPoint& pt) const;
 
     DocDeclStr(    


@@ -621,8 +626,8 @@ class wxPoint2D
 public:
     DocStr(wxPoint2D, "Create a w.Point2D object.", "");
     wxPoint2D( double x=0.0 , double y=0.0 );
 public:
     DocStr(wxPoint2D, "Create a w.Point2D object.", "");
     wxPoint2D( double x=0.0 , double y=0.0 );

-    %name(Point2DCopy) wxPoint2D( const wxPoint2D &pt );
-    %name(Point2DFromPoint) wxPoint2D( const wxPoint &pt );
+    %RenameCtor(Point2DCopy, wxPoint2D( const wxPoint2D &pt ));
+    %RenameCtor(Point2DFromPoint, wxPoint2D( const wxPoint &pt ));

 
     DocDeclAStr(
         void, GetFloor( int *OUTPUT , int *OUTPUT ) const,
 
     DocDeclAStr(
         void, GetFloor( int *OUTPUT , int *OUTPUT ) const,


@@ -672,8 +677,8 @@ public:
         bool, operator!=(const wxPoint2D& pt) const,
         "Test for inequality", "");
 
         bool, operator!=(const wxPoint2D& pt) const,
         "Test for inequality", "");
 

-    %name(x)double m_x;
-    %name(y)double m_y;
+    %Rename(x, double,  m_x);
+    %Rename(y, double,  m_y);

 
     %extend {
         void Set( double x=0 , double y=0 ) {
 
     %extend {
         void Set( double x=0 , double y=0 ) {