Renamed HasChildren() to IsContainer(), added GetParent() to wxDataViewModel

[wxWidgets.git] / include / wx / os2 / region.h

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index a2a669b0de043ce7c23cd91e5db9e43a896f4b34..22a48dc1885fc4f2f2429d9b9e95beb230f4dc61 100644 (file)
--- 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:
 // Purpose:     wxRegion class
 // Author:      David Webster
 // Modified by:


@@ -28,6 +28,7 @@ public:
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
             );
     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( const wxBitmap& bmp)
     {
         Union(bmp);
     wxRegion( const wxBitmap& bmp)
     {
         Union(bmp);


@@ -74,7 +75,7 @@ protected:
     virtual bool DoOffset(wxCoord x, wxCoord y);
     virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
 
     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
     DECLARE_DYNAMIC_CLASS(wxRegion);
 
 }; // end of CLASS wxRegion