add IsOk() to all classes having Ok() method (patch 1570985)

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

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index 652b5c8b47913dcae9fd01f5a0036ed4404c7b78..c7d48a92a71d3912a4cca515cc1851bac53204e3 100644 (file)
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -18,7 +18,6 @@ typedef struct _NSRect NSRect;
 
 class WXDLLEXPORT wxRegion : public wxRegionGeneric
 {
-    DECLARE_DYNAMIC_CLASS(wxRegion);
 public:
     wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     :   wxRegionGeneric(x,y,w,h)
@@ -30,14 +29,14 @@ public:
     :   wxRegionGeneric(rect)
     {}
     wxRegion() {}
+    wxRegion(const wxBitmap& bmp)
+    :   wxRegionGeneric()
+        { Union(bmp); }
     wxRegion(const wxBitmap& bmp,
-            const wxColour& transColour = wxNullColour,
-            int tolerance = 0)
+             const wxColour& transColour, int tolerance = 0)
     :   wxRegionGeneric()
-    {
-        Union(bmp, transColour, tolerance);
-    }
-    ~wxRegion() {}
+        { Union(bmp, transColour, tolerance); }
+    virtual ~wxRegion() {}
     wxRegion(const wxRegion& r)
     :   wxRegionGeneric(r)
     {}
@@ -48,27 +47,8 @@ public:
     wxRegion(const NSRect& rect);
     wxRegion(const NSRect *rects, int count);
 
-    // Use the non-transparent pixels of a wxBitmap for the region to combine
-    // with this region.  If the bitmap has a mask then it will be used,
-    // otherwise the colour to be treated as transparent may be specified,
-    // along with an optional tolerance value.
-    // NOTE: implemented in common/rgncmn.cpp
-    bool Union(const wxBitmap& bmp,
-               const wxColour& transColour = wxNullColour,
-               int   tolerance = 0);
-    /* And because of function hiding: */
-    bool Union(long x, long y, long width, long height)
-    {   return wxRegionGeneric::Union(x,y,width,height); }
-    bool Union(const wxRect& rect)
-    {   return wxRegionGeneric::Union(rect); }
-    bool Union(const wxRegion& region)
-    {   return wxRegionGeneric::Union(region); }
-
-    // Convert the region to a B&W bitmap with the black pixels being inside
-    // the region.
-    // NOTE: implemented in common/rgncmn.cpp
-    wxBitmap ConvertToBitmap() const;
-
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegion);
 };
 
 class WXDLLEXPORT wxRegionIterator : public wxRegionIteratorGeneric
@@ -82,7 +62,7 @@ public:
     wxRegionIterator(const wxRegionIterator& iterator)
     :   wxRegionIteratorGeneric(iterator)
     {}
-    ~wxRegionIterator() {}
+    virtual ~wxRegionIterator() {}
 
     wxRegionIterator& operator=(const wxRegionIterator& iter)
     {   return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); }