X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e0dc94770d598a1cc84d83730d470dd1cfbcca..bf95a04f16759468ee7af83a7a78019399c648bb:/include/wx/os2/region.h?ds=sidebyside

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 92b49a2980..8860e95aa5 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -170,6 +170,22 @@ public:
     wxRegionContain Contains( wxCoord lX
                              ,wxCoord lY
                             ) const;
+
+    //
+    // Convert the region to a B&W bitmap with the black pixels being inside
+    // the region.
+    //
+    wxBitmap        ConvertToBitmap(void) 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& rBmp
+                          ,const wxColour& rTransColour = wxNullColour
+                          ,int   nTolerance = 0
+                         );
+
     //
     // Does the region contain the point pt?
     //
@@ -213,8 +229,8 @@ public:
 
 protected:
     virtual wxObjectRefData* CreateData(void) const;
-    virtual wxObjectRefData* CloneData(wxObjectRefData* pData) const;
-    
+    virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const;
+
     friend class WXDLLEXPORT wxRegionIterator;
     DECLARE_DYNAMIC_CLASS(wxRegion);