set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index c3b4a52f035451f17d62c331a40d26f9c83f04fe..24ac542e838cb1e13ae3c33120761f1d9f69fad5 100644 (file)
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
 // Created:     2004/04/12
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott

-// Licence:    wxWidgets licence
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_REGION_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_REGION_H__


@@ -30,13 +30,13 @@ public:
     :   wxRegionGeneric(rect)
     {}
     wxRegion() {}
     :   wxRegionGeneric(rect)
     {}
     wxRegion() {}

+    wxRegion(const wxBitmap& bmp)
+    :   wxRegionGeneric()
+        { Union(bmp); }

     wxRegion(const wxBitmap& bmp,
     wxRegion(const wxBitmap& bmp,

-            const wxColour& transColour = wxNullColour,
-            int tolerance = 0)
+             const wxColour& transColour, int tolerance = 0)

     :   wxRegionGeneric()
     :   wxRegionGeneric()

-    {
-        Union(bmp, transColour, tolerance);
-    }
+        { Union(bmp, transColour, tolerance); }

     ~wxRegion() {}
     wxRegion(const wxRegion& r)
     :   wxRegionGeneric(r)
     ~wxRegion() {}
     wxRegion(const wxRegion& r)
     :   wxRegionGeneric(r)


@@ -49,13 +49,13 @@ public:
     wxRegion(const NSRect *rects, int count);
 
     // Use the non-transparent pixels of a wxBitmap for the region to combine
     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,
+    // with this region.  First version takes transparency from bitmap's mask,
+    // second lets the user specify the colour to be treated as transparent

     // along with an optional tolerance value.
     // NOTE: implemented in common/rgncmn.cpp
     // along with an optional tolerance value.
     // NOTE: implemented in common/rgncmn.cpp

+    bool Union(const wxBitmap& bmp);

     bool Union(const wxBitmap& bmp,
     bool Union(const wxBitmap& bmp,

-               const wxColour& transColour = wxNullColour,
-               int   tolerance = 0);
+               const wxColour& transColour, 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); }
     /* And because of function hiding: */
     bool Union(long x, long y, long width, long height)
     {   return wxRegionGeneric::Union(x,y,width,height); }