Updates from Paul

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

diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i
index 25fc06628b7334b6ccbcd08428067855c8919750..779e9deaae93b7de3d2a234db6ead76a975aaa8a 100644 (file)
--- a/wxPython/src/_region.i
+++ b/wxPython/src/_region.i
@@ -40,6 +40,27 @@ enum wxRegionContain
 };
 
 
+// // these constants are used with wxRegion::Combine() in the ports which have
+// // this method
+// enum wxRegionOp
+// {
+//     // Creates the intersection of the two combined regions.
+//     wxRGN_AND,
+
+//     // Creates a copy of the region
+//     wxRGN_COPY,
+
+//     // Combines the parts of first region that are not in the second one
+//     wxRGN_DIFF,
+
+//     // Creates the union of two combined regions.
+//     wxRGN_OR,
+
+//     // Creates the union of two regions except for any overlapping areas.
+//     wxRGN_XOR
+// };
+
+
 
 MustHaveApp(wxRegion);
 
@@ -72,6 +93,9 @@ public:
 
     bool IsEmpty();
 
+    // Is region equal (i.e. covers the same area as another one)?
+    bool IsEqual(const wxRegion& region) const;
+
     bool Union(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     %Rename(UnionRect, bool, Union(const wxRect& rect));
     %Rename(UnionRegion, bool, Union(const wxRegion& region));
@@ -97,8 +121,12 @@ public:
                                            const wxColour& transColour,
                                            int   tolerance = 0));
 
+
+//     bool Combine(wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxRegionOp op);
+//     %Rename(CombineRect, bool , Combine(const wxRect& rect, wxRegionOp op));
+//     %Rename(CombineRegion, bool , Combine(const wxRegion& region, wxRegionOp op));
     
-    %property(Box, GetBox, doc="See `GetBox`");
+    %property(Box, GetBox, doc="See `GetBox`");    
 };