X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c6eb3a84be918dcfed2496d014549e13af0f0e9..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/osx/carbon/region.h?ds=inline diff --git a/include/wx/osx/carbon/region.h b/include/wx/osx/carbon/region.h index 480109a8ee..eec9be0037 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; @@ -53,6 +55,7 @@ protected: virtual bool DoOffset(wxCoord x, wxCoord y); virtual bool DoCombine(const wxRegion& region, wxRegionOp op); + virtual bool DoUnionWithRect(const wxRect& rect); private: DECLARE_DYNAMIC_CLASS(wxRegion)