X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85f6b408dfd796805b1c43718e69549506353ca7..81853b98619293be66074d74d2557973c0f3ab21:/include/wx/mac/carbon/region.h diff --git a/include/wx/mac/carbon/region.h b/include/wx/mac/carbon/region.h index 24c060337f..ce3a08204a 100644 --- a/include/wx/mac/carbon/region.h +++ b/include/wx/mac/carbon/region.h @@ -12,10 +12,6 @@ #ifndef _WX_REGION_H_ #define _WX_REGION_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "region.h" -#endif - #include "wx/list.h" #include "wx/gdiobj.h" #include "wx/gdicmn.h" @@ -37,13 +33,14 @@ wxRGN_XOR // Creates the union of two combined regions except for any }; class WXDLLEXPORT wxRegion : public wxGDIObject { -DECLARE_DYNAMIC_CLASS(wxRegion); +DECLARE_DYNAMIC_CLASS(wxRegion) friend class WXDLLEXPORT wxRegionIterator; public: wxRegion(long x, long y, long w, long h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); wxRegion( WXHRGN hRegion ); + wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE ); wxRegion(); wxRegion(const wxBitmap& bmp) { @@ -57,17 +54,13 @@ public: ~wxRegion(); - //# Copying - wxRegion(const wxRegion& r) - : wxGDIObject() - { Ref(r); } - wxRegion& operator = (const wxRegion& r) - { Ref(r); return (*this); } - //# Modify region // Clear current region void Clear(); + // Move the region + bool Offset(wxCoord x, wxCoord y); + // Union rectangle or region with this. bool Union(long x, long y, long width, long height) { return Combine(x, y, width, height, wxRGN_OR); }