X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e0dc94770d598a1cc84d83730d470dd1cfbcca..f014d4bf3e18198c273b3c119ad1a08d46d12c82:/include/wx/os2/region.h?ds=sidebyside diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index 92b49a2980..6205315f22 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -15,6 +15,8 @@ #include "wx/list.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" +#include "wx/bitmap.h" +#include "wx/os2/private.h" class WXDLLEXPORT wxRect; class WXDLLEXPORT wxPoint; @@ -44,6 +46,15 @@ public: ); wxRegion(const wxRect& rRect); wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region + wxRegion( const wxBitmap& bmp) + { + Union(bmp); + } + wxRegion( const wxBitmap& bmp, + const wxColour& transColour, int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } wxRegion(); ~wxRegion(); @@ -170,6 +181,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. First version takes transparency from bitmap's mask, + // second lets the user specify the colour to be treated as transparent + // along with an optional tolerance value. + // NOTE: implemented in common/rgncmn.cpp + bool Union(const wxBitmap& bmp); + bool Union(const wxBitmap& bmp, + const wxColour& transColour, int tolerance = 0); + // // Does the region contain the point pt? // @@ -213,8 +240,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);