Added style flags for selection mode.

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

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 3fa1a815ed896e876c786acef60450a2ce2515f9..348f24008b87ce9f62bbde16c42fd171ab0ca616 100644 (file)
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -6,7 +6,7 @@
 // Created:     10/15/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_REGION_H_
@@ -15,6 +15,7 @@
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
+#include "wx/bitmap.h"
 #include "wx/os2/private.h"
 
 class WXDLLEXPORT wxRect;
@@ -45,18 +46,19 @@ public:
             );
     wxRegion(const wxRect& rRect);
     wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
+    wxRegion( const wxBitmap& bmp)
+    {
+        Union(bmp);
+    }
+    wxRegion( const wxBitmap& bmp,
+              const wxColour& transColour, int tolerance = 0)
+    {
+        Union(bmp, transColour, tolerance);
+    }
 
     wxRegion();
     ~wxRegion();
 
-    //
-    // Copying
-    //
-    inline wxRegion(const wxRegion& rSrc)
-        { Ref(rSrc); }
-    inline wxRegion& operator = (const wxRegion& rSrc)
-        { Ref(rSrc); return (*this); }
-
     //
     // Modify region
     //
@@ -179,13 +181,13 @@ public:
     wxBitmap        ConvertToBitmap(void) 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.
-    bool            Union( const wxBitmap& rBmp
-                          ,const wxColour& rTransColour = wxNullColour
-                          ,int   nTolerance = 0
-                         );
+    // NOTE: implemented in common/rgncmn.cpp
+    bool Union(const wxBitmap& bmp);
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour, int tolerance = 0);
 
     //
     // Does the region contain the point pt?