added wxMOTIF_STR() macro casting away string literal constness for use with Motif...

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

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 0fca2f9090eefe1c77198edeb53db7449d391b49..6205315f22a614489c3d04138b3e7f7fbbdf99aa 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/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;
 
 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
 {
 
 class WXDLLEXPORT wxRegion : public wxGDIObject
 {

-DECLARE_DYNAMIC_CLASS(wxRegion);
-    friend class WXDLLEXPORT wxRegionIterator;

 public:
     wxRegion( wxCoord x
              ,wxCoord y
 public:
     wxRegion( wxCoord x
              ,wxCoord y


@@ -45,7 +45,16 @@ public:
              ,const wxPoint& rBottomRight
             );
     wxRegion(const wxRect& rRect);
              ,const wxPoint& rBottomRight
             );
     wxRegion(const wxRect& rRect);

-    wxRegion(WXHRGN hRegion); // Hangs on to this region
+    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();
 
     wxRegion();
     ~wxRegion();


@@ -67,6 +76,10 @@ public:
     //
     void Clear(void);
 
     //
     void Clear(void);
 

+    bool Offset( wxCoord x
+                ,wxCoord y
+               );
+

     //
     // Union rectangle or region with this.
     //
     //
     // Union rectangle or region with this.
     //


@@ -168,6 +181,22 @@ public:
     wxRegionContain Contains( wxCoord lX
                              ,wxCoord lY
                             ) const;
     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?
     //
     //
     // Does the region contain the point pt?
     //


@@ -208,6 +237,14 @@ public:
     //
     WXHRGN GetHRGN(void) const;
     void   SetPS(HPS hPS);
     //
     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
 }; // end of CLASS wxRegion
 
 class WXDLLEXPORT wxRegionIterator : public wxObject