X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..faba238f8ef016562f66378bde27a7e7d9c2ed4f:/include/wx/msw/region.h diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h index e9463fdd13..b75113bbd9 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(); @@ -21,6 +21,7 @@ public: wxRegion(const wxRect& rect); wxRegion(WXHRGN hRegion); // Hangs on to this region wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); +#if wxUSE_IMAGE wxRegion( const wxBitmap& bmp) { Union(bmp); @@ -30,6 +31,7 @@ public: { Union(bmp, transColour, tolerance); } +#endif // wxUSE_IMAGE virtual ~wxRegion(); @@ -41,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; @@ -57,7 +59,7 @@ protected: DECLARE_DYNAMIC_CLASS(wxRegion) }; -class WXDLLEXPORT wxRegionIterator : public wxObject +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { public: wxRegionIterator() { Init(); }