(blindly) fixed header case confusion (replacement for patch 763760)

[wxWidgets.git] / include / wx / gtk / region.h

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 7c224ab08bc8286689d2d6263abcb3dbd4d4aedb..5ec51def18e57cf04a25c852b6c5902a084c2752 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
 {
 public:
     wxRegion() { }
-    
+
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);
@@ -71,6 +71,14 @@ public:
     }
 
     wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour = wxNullColour,
+              int   tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }
+
     ~wxRegion();
 
     wxRegion( const wxRegion& region )
@@ -114,18 +122,31 @@ public:
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
 
+    // Convert the region to a B&W bitmap with the white 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);
+
+
 public:
     // Init with GdkRegion, set ref count to 2 so that
     // the C++ class will not destroy the region!
     wxRegion( GdkRegion *region );
-    
+
     GdkRegion *GetRegion() const;
 
 protected:
     // ref counting code
     virtual wxObjectRefData *CreateRefData() const;
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-    
+
     // common part of ctors for a rectangle region
     void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 
@@ -146,11 +167,11 @@ public:
     void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
-    operator bool () const;
     bool HaveRects() const;
+    operator bool () const { return HaveRects(); }
 
-    void operator ++ ();
-    void operator ++ (int);
+    wxRegionIterator& operator ++ ();
+    wxRegionIterator operator ++ (int);
 
     wxCoord GetX() const;
     wxCoord GetY() const;