Force the output window to display at the begining of the app

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

diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i
index 714aba481bf1425fb5a5d056379e0859bdddad1d..7a0dcb737c30d7213eebc42f1fac11e6156c089a 100644 (file)
--- a/wxPython/src/_region.i
+++ b/wxPython/src/_region.i
@@ -41,24 +41,17 @@ enum wxRegionContain
 
 
 
 
 
 

+MustHaveApp(wxRegion);
+

 class wxRegion : public wxGDIObject {
 public:
     wxRegion(wxCoord x=0, wxCoord y=0, wxCoord width=0, wxCoord height=0);
 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);
     %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) {
-            PyErr_SetNone(PyExc_NotImplementedError);
-            return NULL;
-        }
-    }
-#endif

 
     ~wxRegion();
 
 
     ~wxRegion();
 


@@ -101,13 +94,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.
     // 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);
 class wxRegionIterator : public wxObject {
 public:
     wxRegionIterator(const wxRegion& region);