X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..eab6e45eef7030527f540c62047fb726b6afc8b8:/wxPython/src/_region.i

diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i
index 714aba481b..a1394b3056 100644
--- a/wxPython/src/_region.i
+++ b/wxPython/src/_region.i
@@ -41,12 +41,15 @@ enum wxRegionContain
 
 
 
+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);
@@ -54,7 +57,7 @@ public:
     %extend {
         %name(RegionFromPoints)wxRegion(int points, wxPoint* points_array,
                                         int fillStyle = wxWINDING_RULE) {
-            PyErr_SetNone(PyExc_NotImplementedError);
+            wxPyRaiseNotImplemented();
             return NULL;
         }
     }
@@ -101,13 +104,16 @@ 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);
 };
 
 
 
+MustHaveApp(wxRegionIterator);
+
 class wxRegionIterator : public wxObject {
 public:
     wxRegionIterator(const wxRegion& region);