From: Robin Dunn <robin@alldunn.com>
Date: Wed, 9 Jun 2004 18:54:34 +0000 (+0000)
Subject: Support for new ctor and Union
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1de0f8e33b47c8bb8bd85eb6553d5cc6b47b5eb4

Support for new ctor and Union


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

diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i
index 29f18cb677..a1394b3056 100644
--- a/wxPython/src/_region.i
+++ b/wxPython/src/_region.i
@@ -46,9 +46,10 @@ MustHaveApp(wxRegion);
 class wxRegion : public wxGDIObject {
 public:
     wxRegion(wxCoord x=0, wxCoord y=0, wxCoord width=0, wxCoord height=0);
-    %name(RegionFromBitmap)wxRegion(const wxBitmap& bmp,
-                                      const wxColour& transColour = wxNullColour,
-                                      int   tolerance = 0);
+    %name(RegionFromBitmap)wxRegion(const wxBitmap& bmp);
+    %name(RegionFromBitmapColour)wxRegion(const wxBitmap& bmp,
+                                          const wxColour& transColour,
+                                          int   tolerance = 0);
 #ifndef __WXMAC__
     %name(RegionFromPoints)wxRegion(int points, wxPoint* points_array,
                                       int fillStyle = wxWINDING_RULE);
@@ -103,9 +104,10 @@ public:
     // with this region.  If the bitmap has a mask then it will be used,
     // otherwise the colour to be treated as transparent may be specified,
     // along with an optional tolerance value.
-    %name(UnionBitmap)bool Union(const wxBitmap& bmp,
-                                 const wxColour& transColour = wxNullColour,
-                                 int   tolerance = 0);
+    %name(UnionBitmap)bool Union(const wxBitmap& bmp);
+    %name(UnionBitmapColour)bool Union(const wxBitmap& bmp,
+                                       const wxColour& transColour,
+                                       int   tolerance = 0);
 };