#ifndef _WX_REGION_H_
#define _WX_REGION_H_
-#ifdef __GNUG__
-#pragma interface "region.h"
-#endif
-
#include "wx/list.h"
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
// classes
//-----------------------------------------------------------------------------
-class wxRegion;
+class WXDLLIMPEXP_CORE wxRegion;
//-----------------------------------------------------------------------------
// constants
// wxRegion
// ----------------------------------------------------------------------------
-class wxRegion : public wxGDIObject
+class WXDLLIMPEXP_CORE wxRegion : public wxGDIObject
{
public:
wxRegion() { }
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);
}
bool Ok() const { return m_refData != NULL; }
- bool operator == ( const wxRegion& region );
- bool operator != ( const wxRegion& region ) { return !(*this == region); }
+ bool operator == ( const wxRegion& region ) const;
+ bool operator != ( const wxRegion& region ) const { return !(*this == region); }
void Clear();
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:
void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
private:
- DECLARE_DYNAMIC_CLASS(wxRegion);
+ DECLARE_DYNAMIC_CLASS(wxRegion)
};
// ----------------------------------------------------------------------------
// wxRegionIterator: decomposes a region into rectangles
// ----------------------------------------------------------------------------
-class wxRegionIterator: public wxObject
+class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
{
public:
wxRegionIterator();
wxRegion m_region;
private:
- DECLARE_DYNAMIC_CLASS(wxRegionIterator);
+ DECLARE_DYNAMIC_CLASS(wxRegionIterator)
};
#endif