compilation fix

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

diff --git a/include/wx/os2/region.h b/include/wx/os2/region.h
index 92b49a2980b4a32a5b69bd1a6eb0ac35575fc7c5..8860e95aa54850e42465f59e49d787bd09a8aa35 100644 (file)
--- a/include/wx/os2/region.h
+++ b/include/wx/os2/region.h
@@ -170,6 +170,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.  If the bitmap has a mask then it will be used,
+    // otherwise the colour to be treated as transparent may be specified,
+    // along with an optional tolerance value.
+    bool            Union( const wxBitmap& rBmp
+                          ,const wxColour& rTransColour = wxNullColour
+                          ,int   nTolerance = 0
+                         );
+

     //
     // Does the region contain the point pt?
     //
     //
     // Does the region contain the point pt?
     //


@@ -213,8 +229,8 @@ public:
 
 protected:
     virtual wxObjectRefData* CreateData(void) const;
 
 protected:
     virtual wxObjectRefData* CreateData(void) const;

-    virtual wxObjectRefData* CloneData(wxObjectRefData* pData) const;
-    
+    virtual wxObjectRefData* CloneData(const wxObjectRefData* pData) const;
+

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