X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1f7d2aa9cb1857cf87e105ebbd36a92676bbde..6028be3f39babc4530472a4139576fe318c6aa90:/wxPython/src/_region.i diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i index 29f18cb677..7a0dcb737c 100644 --- a/wxPython/src/_region.i +++ b/wxPython/src/_region.i @@ -46,21 +46,12 @@ 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); -#ifndef __WXMAC__ + %name(RegionFromBitmap)wxRegion(const wxBitmap& bmp); + %name(RegionFromBitmapColour)wxRegion(const wxBitmap& bmp, + const wxColour& transColour, + int tolerance = 0); %name(RegionFromPoints)wxRegion(int points, wxPoint* points_array, int fillStyle = wxWINDING_RULE); -#else - %extend { - %name(RegionFromPoints)wxRegion(int points, wxPoint* points_array, - int fillStyle = wxWINDING_RULE) { - wxPyRaiseNotImplemented(); - return NULL; - } - } -#endif ~wxRegion(); @@ -103,9 +94,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); };