X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8ff046ba980a89f11125477e736cf235ebd7186..ccaf2891c9082773460c50c7eb7a910ea51e7003:/include/wx/msw/region.h diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index 97203acb3f..b2ead3ca9c 100644 --- a/include/wx/msw/region.h +++ b/include/wx/msw/region.h @@ -12,7 +12,7 @@ #ifndef _WX_MSW_REGION_H_ #define _WX_MSW_REGION_H_ -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion(); @@ -20,7 +20,7 @@ public: wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); #if wxUSE_IMAGE wxRegion( const wxBitmap& bmp) { @@ -43,8 +43,8 @@ public: WXHRGN GetHRGN() const; protected: - virtual wxObjectRefData *CreateRefData() const; - virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual bool DoIsEqual(const wxRegion& region) const; virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; @@ -59,7 +59,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxRegion) }; -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator() { Init(); }