X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1542ea396a625766c59d683adbb1d613c1344d50..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/gtk/region.h?ds=inline diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h index 03c2844e0b..40c7d60d42 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); } @@ -122,17 +125,18 @@ public: wxRegionContain Contains(const wxPoint& pt) const; 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); public: @@ -151,7 +155,7 @@ protected: void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); private: - DECLARE_DYNAMIC_CLASS(wxRegion); + DECLARE_DYNAMIC_CLASS(wxRegion) }; // ---------------------------------------------------------------------------- @@ -186,7 +190,7 @@ private: wxRegion m_region; private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) };