X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/osx/carbon/region.h?ds=sidebyside diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 480109a8ee..685c39de66 100644 --- a/include/wx/osx/carbon/region.h +++ b/include/wx/osx/carbon/region.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: region.h +// Name: wx/osx/carbon/region.h // Purpose: wxRegion class // Author: Stefan Csomor // Modified by: @@ -17,12 +17,13 @@ class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine { public: + wxRegion() { } 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(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); +#if wxUSE_IMAGE wxRegion(const wxBitmap& bmp) { Union(bmp); @@ -32,6 +33,7 @@ public: { Union(bmp, transColour, tolerance); } +#endif virtual ~wxRegion(); @@ -40,7 +42,7 @@ public: virtual bool IsEmpty() const; // Internal - const WXHRGN GetWXHRGN() const ; + WXHRGN GetWXHRGN() const ; protected: virtual wxGDIRefData *CreateGDIRefData() const;