Applied patch [ 1218833 ] [wxMSW] wxListBox optimisation for XP

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

diff --git a/include/wx/cocoa/region.h b/include/wx/cocoa/region.h
index 287217ff24ea958cdb4aaca297e3d3306d379547..24ac542e838cb1e13ae3c33120761f1d9f69fad5 100644 (file)
--- a/include/wx/cocoa/region.h
+++ b/include/wx/cocoa/region.h
@@ -14,6 +14,8 @@
 
 #include "wx/generic/region.h"
 
 
 #include "wx/generic/region.h"
 

+typedef struct _NSRect NSRect;
+

 class WXDLLEXPORT wxRegion : public wxRegionGeneric
 {
     DECLARE_DYNAMIC_CLASS(wxRegion);
 class WXDLLEXPORT wxRegion : public wxRegionGeneric
 {
     DECLARE_DYNAMIC_CLASS(wxRegion);


@@ -28,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)


@@ -42,14 +44,18 @@ public:
     wxRegion& operator= (const wxRegion& r)
     {   return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); }
 
     wxRegion& operator= (const wxRegion& r)
     {   return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); }
 

+    // Cocoa-specific creation
+    wxRegion(const NSRect& rect);
+    wxRegion(const NSRect *rects, int count);
+

     // Use the non-transparent pixels of a wxBitmap for the region to combine
     // 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); }