X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/320bf9ceec62cacabb3b2d811f9139a1db2f4f1f..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/mgl/region.h diff --git a/include/wx/mgl/region.h b/include/wx/mgl/region.h index 35f3137f34..052f33b40b 100644 --- a/include/wx/mgl/region.h +++ b/include/wx/mgl/region.h @@ -15,7 +15,7 @@ class MGLRegion; -class WXDLLEXPORT wxRegion : public wxRegionBase +class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase { public: wxRegion(); @@ -23,7 +23,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(const MGLRegion& region); - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion(const wxBitmap& bmp) { Union(bmp); @@ -44,9 +44,8 @@ public: const MGLRegion& GetMGLRegion() const; protected: - // ref counting code - 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; @@ -63,13 +62,13 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxRegion); - friend class WXDLLEXPORT wxRegionIterator; + friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; }; WX_DECLARE_EXPORTED_LIST(wxRect, wxRegionRectList); -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator(void);