X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..b8f0ac88a51be909c0e5b87657ea0a5dc9bbb721:/include/wx/generic/region.h diff --git a/include/wx/generic/region.h b/include/wx/generic/region.h index ea6830e167..665f8f8b15 100644 --- a/include/wx/generic/region.h +++ b/include/wx/generic/region.h @@ -12,12 +12,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 +29,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; @@ -42,10 +45,10 @@ protected: virtual bool DoSubtract(const wxRegion& region); virtual bool DoXor(const wxRegion& region); - friend class WXDLLEXPORT wxRegionIteratorGeneric; + friend class WXDLLIMPEXP_FWD_CORE wxRegionIteratorGeneric; }; -class WXDLLEXPORT wxRegionIteratorGeneric : public wxObject +class WXDLLIMPEXP_CORE wxRegionIteratorGeneric : public wxObject { public: wxRegionIteratorGeneric();