X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a16d7370e3cdc7d583a6f14ab11b3a1d27b73df..728447a06a1e1500beb1d073a12e73f2402caea6:/src/x11/region.cpp diff --git a/src/x11/region.cpp b/src/x11/region.cpp index bf46762fe0..74477235de 100644 --- a/src/x11/region.cpp +++ b/src/x11/region.cpp @@ -31,7 +31,7 @@ // wxRegionRefData: private class containing the information about the region // ---------------------------------------------------------------------------- -class wxRegionRefData : public wxObjectRefData +class wxRegionRefData : public wxGDIRefData { public: wxRegionRefData() @@ -84,7 +84,7 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region ); } -wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), int WXUNUSED(fillStyle) ) +wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), wxPolygonFillMode WXUNUSED(fillStyle) ) { #if 0 XPoint *xpoints = new XPoint[n]; @@ -115,12 +115,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); } @@ -337,7 +337,7 @@ wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const WXRegion *wxRegion::GetX11Region() const { if (!m_refData) - return (WXRegion*) NULL; + return NULL; return (WXRegion*) M_REGIONDATA->m_region; } @@ -361,7 +361,7 @@ struct _XRegion { _XBox *rects, extents; }; -class wxRIRefData: public wxObjectRefData +class wxRIRefData: public wxGDIRefData { public: