undo the last change as it results in buildbot configuration error

[wxWidgets.git] / interface / wx / region.h

diff --git a/interface/wx/region.h b/interface/wx/region.h
index ac00b3a9ceea989ae62388bea0d12f8c98fd7f58..45e42d730ec9c71d0d686107914ca0a9b8090cec 100644 (file)
--- a/interface/wx/region.h
+++ b/interface/wx/region.h
@@ -120,7 +120,7 @@ public:
         A wxPython alias for this operator is called Next.
         @endWxPythonOnly
     */
         A wxPython alias for this operator is called Next.
         @endWxPythonOnly
     */

-    void operator ++();
+    wxRegionIterator& operator ++();

 
     /**
         Returns @true if there are still some rectangles; otherwise returns @false.
 
     /**
         Returns @true if there are still some rectangles; otherwise returns @false.


@@ -181,7 +181,7 @@ public:
         in the provided array.
         @a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE.
     */
         in the provided array.
         @a fillStyle parameter may have values @c wxWINDING_RULE or @c wxODDEVEN_RULE.
     */

-    wxRegion(size_t n, const wxPoint* points, int fillStyle = wxWINDING_RULE);
+    wxRegion(size_t n, const wxPoint* points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

     /**
         Constructs a region using a bitmap. See Union() for more details.
     */
     /**
         Constructs a region using a bitmap. See Union() for more details.
     */


@@ -198,19 +198,19 @@ public:
         See @ref overview_refcount_destruct "reference-counted object destruction" for
         more info.
     */
         See @ref overview_refcount_destruct "reference-counted object destruction" for
         more info.
     */

-    ~wxRegion();
+    virtual ~wxRegion();

 
     /**
         Clears the current region.
     */
 
     /**
         Clears the current region.
     */

-    void Clear();
+    virtual void Clear();

 
     /**
         Returns a value indicating whether the given point is contained within the region.
 
         @return The return value is one of @c wxOutRegion and @c wxInRegion.
     */
 
     /**
         Returns a value indicating whether the given point is contained within the region.
 
         @return The return value is one of @c wxOutRegion and @c wxInRegion.
     */

-    wxRegionContain Contains(long& x, long& y) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y) const;

     /**
         Returns a value indicating whether the given point is contained within the region.
 
     /**
         Returns a value indicating whether the given point is contained within the region.
 


@@ -227,7 +227,7 @@ public:
               ::wxInRegion then indicates that all or some part of the region is
               contained in this region.
     */
               ::wxInRegion then indicates that all or some part of the region is
               contained in this region.
     */

-    wxRegionContain Contains(long& x, long& y, long& width, long& height) const;
+    wxRegionContain Contains(wxCoord x, wxCoord y, wxCoord width, wxCoord height) const;

     /**
         Returns a value indicating whether the given rectangle is contained within the
         region.
     /**
         Returns a value indicating whether the given rectangle is contained within the
         region.


@@ -252,7 +252,7 @@ public:
     */
     void GetBox(wxCoord& x, wxCoord& y, wxCoord& width,
                 wxCoord& height) const;
     */
     void GetBox(wxCoord& x, wxCoord& y, wxCoord& width,
                 wxCoord& height) const;

-    const wxRect  GetBox() const;
+    wxRect GetBox() const;

     //@}
 
     /**
     //@}
 
     /**


@@ -291,7 +291,7 @@ public:
     /**
         Returns @true if the region is empty, @false otherwise.
     */
     /**
         Returns @true if the region is empty, @false otherwise.
     */

-    bool IsEmpty() const;
+    virtual bool IsEmpty() const;

 
     /**
         Returns @true if the region is equal to, i.e. covers the same area as,
 
     /**
         Returns @true if the region is equal to, i.e. covers the same area as,


@@ -427,7 +427,7 @@ public:
     /**
         Assignment operator, using @ref overview_refcount.
     */
     /**
         Assignment operator, using @ref overview_refcount.
     */

-    void operator =(const wxRegion& region);
+    wxRegion& operator=(const wxRegion& region);

 };
 
 /**
 };
 
 /**