X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1542ea396a625766c59d683adbb1d613c1344d50..8397cab4dafee82a887785a80ab8f588a68d9f27:/include/wx/mgl/region.h?ds=sidebyside diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 3508341a19..1e6dae11e4 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -11,14 +11,13 @@ #ifndef _WX_REGION_H_ #define _WX_REGION_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "region.h" #endif #include "wx/list.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" -#include "wx/list.h" class WXDLLEXPORT wxRect; class WXDLLEXPORT wxPoint; @@ -41,9 +40,12 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(const MGLRegion& region); + 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); } @@ -103,17 +105,18 @@ public: // 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 + // 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, + // 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); // implementation from now on: