X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/region.h?ds=inline

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 22a48dc188..40ef561b96 100644
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/15/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -15,7 +14,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,7 +27,7 @@ public:
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // 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 );
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);
@@ -64,8 +63,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;
@@ -80,9 +79,8 @@ protected:
 
 }; // 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);
@@ -110,6 +108,8 @@ private:
     long                            m_lNumRects;
     wxRegion                        m_vRegion;
     wxRect*                         m_pRects;
+
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 }; // end of wxRegionIterator
 
 #endif // _WX_OS2_REGION_H_