X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/osx/carbon/region.cpp?ds=sidebyside diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp index d08fd4984c..b2d0c251ca 100644 --- a/src/osx/carbon/region.cpp +++ b/src/osx/carbon/region.cpp @@ -16,7 +16,7 @@ #include "wx/gdicmn.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) @@ -96,7 +96,7 @@ wxRegion::wxRegion(const wxRect& rect) m_refData = new wxRegionRefData(rect.x , rect.y , rect.width , rect.height); } -wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle)) +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(fillStyle)) { wxUnusedVar(n); wxUnusedVar(points); @@ -167,7 +167,7 @@ wxGDIRefData *wxRegion::CreateGDIRefData() const wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { - return new wxRegionRefData(*wx_static_cast(const wxRegionRefData *, data)); + return new wxRegionRefData(*static_cast(data)); } //----------------------------------------------------------------------------- @@ -262,10 +262,10 @@ bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const { CGRect box ; HIShapeGetBounds( M_REGION , &box ) ; - x = wx_static_cast(int, box.origin.x); - y = wx_static_cast(int, box.origin.y); - w = wx_static_cast(int, box.size.width); - h = wx_static_cast(int, box.size.height); + x = static_cast(box.origin.x); + y = static_cast(box.origin.y); + w = static_cast(box.size.width); + h = static_cast(box.size.height); return true; }