Remove a(nother) guaranteed build failure until what is it testing

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

diff --git a/include/wx/x11/region.h b/include/wx/x11/region.h
index ca7e628dcebb256c57471c0b8b3940c70bcccf8e..6d25a33e0df0d2227f9b938aa4fe7779f095ecd5 100644 (file)
--- a/include/wx/x11/region.h
+++ b/include/wx/x11/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "region.h"
 #endif
 
 #pragma interface "region.h"
 #endif
 


@@ -74,9 +74,12 @@ public:
 
     wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
 
 
     wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
 

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

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

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

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


@@ -127,12 +130,13 @@ public:
     wxBitmap ConvertToBitmap() const;
 
     // Use the non-transparent pixels of a wxBitmap for the region to combine
     wxBitmap ConvertToBitmap() const;
 
     // 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.
     // 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);

 
 
 public:
 
 
 public: