Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/region.h b/interface/wx/region.h
index 6d8d212213fbde8c319ba27b10961cb1d73f0c19..7430c592e598ea6dd05470808edc83bc96b2b618 100644 (file)
--- a/interface/wx/region.h
+++ b/interface/wx/region.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxRegionIterator
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -33,7 +33,6 @@ enum wxRegionContain
 
 /**
     @class wxRegionIterator
-    @wxheader{region.h}
 
     This class is used to iterate through the rectangles in a region,
     typically when examining the damaged regions of a window within an OnPaint call.
@@ -121,7 +120,7 @@ public:
         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.
@@ -135,7 +134,6 @@ public:
 
 /**
     @class wxRegion
-    @wxheader{region.h}
 
     A wxRegion represents a simple or complex region on a device context or window.
 
@@ -183,7 +181,7 @@ public:
         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.
     */
@@ -200,19 +198,19 @@ public:
         See @ref overview_refcount_destruct "reference-counted object destruction" for
         more info.
     */
-    ~wxRegion();
+    virtual ~wxRegion();
 
     /**
         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.
     */
-    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.
 
@@ -229,7 +227,7 @@ public:
               ::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.
@@ -254,7 +252,7 @@ public:
     */
     void GetBox(wxCoord& x, wxCoord& y, wxCoord& width,
                 wxCoord& height) const;
-    const wxRect  GetBox() const;
+    wxRect GetBox() const;
     //@}
 
     /**
@@ -293,7 +291,7 @@ public:
     /**
         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,
@@ -429,7 +427,7 @@ public:
     /**
         Assignment operator, using @ref overview_refcount.
     */
-    void operator =(const wxRegion& region);
+    wxRegion& operator=(const wxRegion& region);
 };
 
 /**