X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..e91e1e3d5cab263883c1cee1689c898b8f7c4ecd:/include/wx/generic/region.h diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h index e82714abcd..1c5048dbf2 100644 --- a/include/wx/generic/region.h +++ b/include/wx/generic/region.h @@ -4,7 +4,6 @@ // Author: David Elliott // Modified by: // Created: 2004/04/12 -// RCS-ID: $Id$ // Copyright: (c) 2004 David Elliott // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,12 +11,15 @@ #ifndef _WX_GENERIC_REGION_H__ #define _WX_GENERIC_REGION_H__ -class WXDLLEXPORT wxRegionGeneric : public wxRegionBase +class WXDLLIMPEXP_CORE wxRegionGeneric : public wxRegionBase { public: wxRegionGeneric(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRegionGeneric(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegionGeneric(const wxRect& rect); + wxRegionGeneric(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); + wxRegionGeneric(const wxBitmap& bmp); + wxRegionGeneric(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); wxRegionGeneric(); virtual ~wxRegionGeneric(); @@ -26,8 +28,8 @@ public: virtual bool IsEmpty() const; protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; // wxRegionBase pure virtuals virtual bool DoIsEqual(const wxRegion& region) const; @@ -45,7 +47,7 @@ protected: friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric; }; -class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject +class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject { public: wxRegionIteratorGeneric();