X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac9e3f1f1c4ba844c5598aa577e51d128dd5921b..c9ccc09c64f4c29d4667796bef7b507d9e8d25ed:/include/wx/region.h diff --git a/include/wx/region.h b/include/wx/region.h index 38c61ccf9c..915ed71d2a 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -67,7 +67,7 @@ public: wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); wxRegion(const wxRect& rect); - wxRegion(size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE); + wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxRegion(const wxBitmap& bmp); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); #endif // 0 @@ -183,7 +183,7 @@ protected: // ports with Combine() in this class #if defined(__WXPALMOS__) || \ defined(__WXMSW__) || \ - ( defined(__WXMAC__) && wxOSX_USE_CARBON ) || \ + ( defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON ) || \ defined(__WXPM__) #define wxHAS_REGION_COMBINE