X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec02a2f7de3d6f4e11c4dd72bf69c33fcc49ba84..4bff335abeed922f191fe4c6bf78e4bce63995b3:/include/wx/os2/region.h?ds=sidebyside diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index f4e2235cc0..126deb0937 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -64,8 +64,8 @@ public: void SetPS(HPS hPS); protected: - virtual wxObjectRefData* CreateData(void) const; - virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const; + virtual wxGDIRefData* CreateGDIRefData(void) const; + virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* pData) const; virtual bool DoIsEqual(const wxRegion& region) const; virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; @@ -75,14 +75,13 @@ protected: virtual bool DoOffset(wxCoord x, wxCoord y); virtual bool DoCombine(const wxRegion& region, wxRegionOp op); - friend class WXDLLEXPORT wxRegionIterator; + friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; DECLARE_DYNAMIC_CLASS(wxRegion); }; // end of CLASS wxRegion class WXDLLEXPORT wxRegionIterator : public wxObject { -DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: wxRegionIterator(); wxRegionIterator(const wxRegion& rRegion); @@ -110,6 +109,8 @@ private: long m_lNumRects; wxRegion m_vRegion; wxRect* m_pRects; + + DECLARE_DYNAMIC_CLASS(wxRegionIterator) }; // end of wxRegionIterator #endif // _WX_OS2_REGION_H_