X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..17d3ce7eff96fd24cd93501dfe2b9d625904976e:/include/wx/msw/region.h diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index f145db6025..4539ec1d81 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -48,9 +48,12 @@ public: wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion( const wxBitmap& bmp) + { + Union(bmp); + } wxRegion( const wxBitmap& bmp, - const wxColour& transColour = wxNullColour, - int tolerance = 0) + const wxColour& transColour, int tolerance = 0) { Union(bmp, transColour, tolerance); } @@ -119,12 +122,13 @@ public: 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, + // 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 = wxNullColour, - int tolerance = 0); + const wxColour& transColour, int tolerance = 0); // Internal bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);