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 e8868bf6315e49dbe3f7ce2abb88f254a9d02aa6..348f24008b87ce9f62bbde16c42fd171ab0ca616 100644 (file)
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -15,6 +15,8 @@
 #include "wx/list.h"
 #include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
+#include "wx/bitmap.h"
+#include "wx/os2/private.h"
 
 class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxPoint;
@@ -33,8 +35,6 @@ enum wxRegionOp { wxRGN_AND         // Creates the intersection of the two combi
 
 class WXDLLEXPORT wxRegion : public wxGDIObject
 {
-DECLARE_DYNAMIC_CLASS(wxRegion);
-    friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion( wxCoord x
              ,wxCoord y
@@ -46,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
     //
@@ -67,6 +68,10 @@ public:
     //
     void Clear(void);
 
+    bool Offset( wxCoord x
+                ,wxCoord y
+               );
+
     //
     // Union rectangle or region with this.
     //
@@ -168,6 +173,22 @@ public:
     wxRegionContain Contains( wxCoord lX
                              ,wxCoord lY
                             ) const;
+
+    //
+    // Convert the region to a B&W bitmap with the black pixels being inside
+    // the region.
+    //
+    wxBitmap        ConvertToBitmap(void) const;
+
+    // Use the non-transparent pixels of a wxBitmap for the region to combine
+    // 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
+    bool Union(const wxBitmap& bmp);
+    bool Union(const wxBitmap& bmp,
+               const wxColour& transColour, int tolerance = 0);
+
     //
     // Does the region contain the point pt?
     //
@@ -208,6 +229,14 @@ public:
     //
     WXHRGN GetHRGN(void) const;
     void   SetPS(HPS hPS);
+
+protected:
+    virtual wxObjectRefData* CreateData(void) const;
+    virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const;
+
+    friend class WXDLLEXPORT wxRegionIterator;
+    DECLARE_DYNAMIC_CLASS(wxRegion);
+
 }; // end of CLASS wxRegion
 
 class WXDLLEXPORT wxRegionIterator : public wxObject