X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..d07e1e0c13c99291bf1d81f5bcfe252f9d9d4010:/src/msw/region.cpp?ds=sidebyside diff --git a/src/msw/region.cpp b/src/msw/region.cpp index 51aff2b707..3083a5a635 100644 --- a/src/msw/region.cpp +++ b/src/msw/region.cpp @@ -72,7 +72,7 @@ public: private: // Cannot use -// DECLARE_NO_COPY_CLASS(wxRegionRefData) +// wxDECLARE_NO_COPY_CLASS(wxRegionRefData); // because copy constructor is explicitly declared above; // but no copy assignment operator is defined, so declare // it private to prevent the compiler from defining it: @@ -92,7 +92,7 @@ private: wxRegion::wxRegion() { - m_refData = (wxRegionRefData *)NULL; + m_refData = NULL; } wxRegion::wxRegion(WXHRGN hRegion) @@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect) M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); } -wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle) +wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle) { #if defined(__WXMICROWIN__) || defined(__WXWINCE__) wxUnusedVar(n); @@ -143,12 +143,12 @@ wxRegion::~wxRegion() // m_refData unrefed in ~wxObject } -wxObjectRefData *wxRegion::CreateRefData() const +wxGDIRefData *wxRegion::CreateGDIRefData() const { return new wxRegionRefData; } -wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const +wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const { return new wxRegionRefData(*(wxRegionRefData *)data); }