X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a24aff654fb10971e82abccc1b56217d556d447b..75d3838010e2d8a9592a4a016e2994f4f0d3070b:/include/wx/cocoa/region.h?ds=sidebyside

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index 1d26425b96..3ecf89882f 100644
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -40,23 +40,30 @@ class WXDLLEXPORT wxRegion : public wxGDIObject {
 DECLARE_DYNAMIC_CLASS(wxRegion);
 	friend class WXDLLEXPORT wxRegionIterator;
 public:
-    wxRegion(long x, long y, long w, long h);
+    wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion();
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour = wxNullColour,
+              int   tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }
+
     ~wxRegion();
-    
+
     //# Copying
     wxRegion(const wxRegion& r)
         : wxGDIObject()
     { Ref(r); }
     wxRegion& operator = (const wxRegion& r)
     { Ref(r); return (*this); }
-    
+
     //# Modify region
     // Clear current region
     void Clear();
-    
+
     // Union rectangle or region with this.
     bool Union(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_OR); }
@@ -64,7 +71,7 @@ public:
         { return Combine(rect, wxRGN_OR); }
     bool Union(const wxRegion& region)
         { return Combine(region, wxRGN_OR); }
-    
+
     // Intersect rectangle or region with this.
     bool Intersect(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_AND); }
@@ -72,7 +79,7 @@ public:
         { return Combine(rect, wxRGN_AND); }
     bool Intersect(const wxRegion& region)
         { return Combine(region, wxRGN_AND); }
-    
+
     // Subtract rectangle or region from this:
     // Combines the parts of 'this' that are not part of the second region.
     bool Subtract(long x, long y, long width, long height)
@@ -81,7 +88,7 @@ public:
         { return Combine(rect, wxRGN_DIFF); }
     bool Subtract(const wxRegion& region)
         { return Combine(region, wxRGN_DIFF); }
-    
+
     // XOR: the union of two combined regions except for any overlapping areas.
     bool Xor(long x, long y, long width, long height)
         { return Combine(x, y, width, height, wxRGN_XOR); }
@@ -89,16 +96,16 @@ public:
         { return Combine(rect, wxRGN_XOR); }
     bool Xor(const wxRegion& region)
         { return Combine(region, wxRGN_XOR); }
-    
+
     //# Information on region
     // Outer bounds of region
     void GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const;
     wxRect GetBox() const ;
-    
+
     // Is region empty?
     bool Empty() const;
     inline bool IsEmpty() const { return Empty(); }
-    
+
     //# Tests
     // Does the region contain the point (x,y)?
     wxRegionContain Contains(long x, long y) const;
@@ -108,7 +115,20 @@ public:
     wxRegionContain Contains(long x, long y, long w, long h) const;
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
-    
+
+    // Convert the region to a B&W bitmap with the black pixels being inside
+    // the region.
+    wxBitmap ConvertToBitmap() const;
+
+    // Use the non-transparent pixels of a wxBitmap for the region to combine
+    // 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.
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour = wxNullColour,
+               int   tolerance = 0);
+
+
     // Internal
     bool Combine(long x, long y, long width, long height, wxRegionOp op);
     bool Combine(const wxRegion& region, wxRegionOp op);
@@ -118,7 +138,7 @@ public:
 class WXDLLEXPORT wxRegionIterator : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-        
+
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
@@ -129,13 +149,13 @@ public:
 
     void Reset() { m_current = 0; }
     void Reset(const wxRegion& region);
-    
+
     operator bool () const { return m_current < m_numRects; }
     bool HaveRects() const { return m_current < m_numRects; }
 
     wxRegionIterator& operator++();
     wxRegionIterator operator++(int);
-    
+
     long GetX() const;
     long GetY() const;
     long GetW() const;