Separation of wxUSE_FILEDLG and wxUSE_DIRDLG in generic implementations.

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

diff --git a/include/wx/motif/region.h b/include/wx/motif/region.h
index 7e9517c76533e902565dea244bec4d981a4c8f40..a03e4e8ced48372a1df9c12cb58ea1211ad7c2f1 100644 (file)
--- a/include/wx/motif/region.h
+++ b/include/wx/motif/region.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 
 #ifndef _WX_REGION_H_
 #define _WX_REGION_H_
 

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

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


@@ -48,9 +48,12 @@ public:
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion();
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion();

+    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);
     }


@@ -107,17 +110,18 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
 

-    // Convert the region to a B&W bitmap with the black pixels being inside
+    // Convert the region to a B&W bitmap with the white pixels being inside

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

 
     // Internal
     bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
 
     // Internal
     bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);


@@ -127,7 +131,7 @@ public:
     // Get the internal Region handle
     WXRegion GetXRegion() const;
 
     // Get the internal Region handle
     WXRegion GetXRegion() const;
 

-    // 'Naughty' functions that allow wxWindows to use a list of rects
+    // 'Naughty' functions that allow wxWidgets to use a list of rects

     // instead of the region, in certain circumstances (e.g. when
     // making a region out of the update rectangles).
     // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
     // instead of the region, in certain circumstances (e.g. when
     // making a region out of the update rectangles).
     // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.