X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/msw/region.h?ds=sidebyside diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index 4a340015f6..0d14ea4452 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -5,14 +5,14 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) 1997-2002 wxWindows team +// Copyright: (c) 1997-2002 wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_REGION_H_ #define _WX_REGION_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "region.h" #endif @@ -48,11 +48,20 @@ 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, int tolerance = 0) + { + Union(bmp, transColour, tolerance); + } virtual ~wxRegion(); // Copying - wxRegion(const wxRegion& r) + wxRegion(const wxRegion& r) : wxGDIObject(r) { Ref(r); } wxRegion& operator = (const wxRegion& r) { Ref(r); return (*this); } @@ -108,6 +117,19 @@ public: // Does the region contain the rectangle rect? wxRegionContain Contains(const wxRect& rect) const; + // 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. 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); + // Internal bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op); bool Combine(const wxRegion& region, wxRegionOp op); @@ -130,7 +152,7 @@ class WXDLLEXPORT wxRegionIterator : public wxObject public: wxRegionIterator() { Init(); } wxRegionIterator(const wxRegion& region); - wxRegionIterator(const wxRegionIterator& ri) { Init(); *this = ri; } + wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; } wxRegionIterator& operator=(const wxRegionIterator& ri); @@ -166,7 +188,7 @@ private: wxRegion m_region; wxRect* m_rects; - DECLARE_DYNAMIC_CLASS(wxRegionIterator); + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; #endif