X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..b5ec0c78b521cfa0f276e4d5d830f35b4fa26e91:/include/wx/os2/region.h diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h index a2a669b0de..a5c06bbac5 100644 --- a/include/wx/os2/region.h +++ b/include/wx/os2/region.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: region.h +// Name: wx/os2/region.h // Purpose: wxRegion class // Author: David Webster // Modified by: @@ -15,7 +15,7 @@ #include "wx/list.h" #include "wx/os2/private.h" -class WXDLLEXPORT wxRegion : public wxRegionWithCombine +class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: wxRegion( wxCoord x @@ -28,6 +28,7 @@ public: ); wxRegion(const wxRect& rRect); wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); wxRegion( const wxBitmap& bmp) { Union(bmp); @@ -63,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; @@ -74,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 +class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject { -DECLARE_DYNAMIC_CLASS(wxRegionIterator); public: wxRegionIterator(); wxRegionIterator(const wxRegion& rRegion); @@ -109,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_