X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ababdf5ffd2832eb96f1a6b94cbb325ed74dbcad..4a699e3a59b19c21b6faae714b56cac5a75df2e2:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index dcf7ee5b2b..1e1cb84e8f 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -137,7 +137,7 @@ wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const bool wxRegion::DoIsEqual(const wxRegion& region) const { return gdk_region_equal(M_REGIONDATA->m_region, - M_REGIONDATA_OF(region)->m_region); + M_REGIONDATA_OF(region)->m_region) != 0; } // ---------------------------------------------------------------------------- @@ -292,7 +292,7 @@ bool wxRegion::IsEmpty() const if (!m_refData) return true; - return gdk_region_empty( M_REGIONDATA->m_region ); + return gdk_region_empty( M_REGIONDATA->m_region ) != 0; } wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const @@ -458,15 +458,17 @@ wxRect wxRegionIterator::GetRect() const wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) { - wxDELETEA(m_rects); - - m_current = ri.m_current; - m_numRects = ri.m_numRects; - if ( m_numRects ) + if (this != &ri) { - m_rects = new wxRect[m_numRects]; - memcpy(m_rects, ri.m_rects, m_numRects * sizeof m_rects[0]); - } + wxDELETEA(m_rects); + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + memcpy(m_rects, ri.m_rects, m_numRects * sizeof m_rects[0]); + } + } return *this; }