X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/819451b6c76bdcaf5fd8865479209859511aa986..07170120ee06625fead8c72ad537bf41fa3ed8a9:/include/wx/gtk/region.h?ds=sidebyside diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 5ec51def18..5eec88fe82 100644 --- a/include/wx/gtk/region.h +++ b/include/wx/gtk/region.h @@ -10,7 +10,7 @@ #ifndef _WX_GTK_REGION_H_ #define _WX_GTK_REGION_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface #endif @@ -72,9 +72,12 @@ public: 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); } @@ -127,12 +130,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); public: