X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3a44e057b5183acdf2cf133f059cf94c7884738..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 0fd5a8ac44..964ae16316 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -46,7 +46,7 @@ public: m_region = gdk_region_copy(refData.m_region); } - ~wxRegionRefData() + virtual ~wxRegionRefData() { if (m_region) gdk_region_destroy( m_region ); @@ -133,13 +133,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const // wxRegion comparison // ---------------------------------------------------------------------------- -bool wxRegion::operator==( const wxRegion& region ) const +bool wxRegion::DoIsEqual(const wxRegion& region) const { - if (m_refData == region.m_refData) return true; - - if (!m_refData || !region.m_refData) return false; - - // compare the regions themselves, not the pointers to ref data! return gdk_region_equal(M_REGIONDATA->m_region, M_REGIONDATA_OF(region)->m_region); } @@ -153,27 +148,27 @@ void wxRegion::Clear() UnRef(); } -bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::DoUnionWithRect(const wxRect& r) { // workaround for a strange GTK/X11 bug: taking union with an empty // rectangle results in an empty region which is definitely not what we // want - if ( !width || !height ) + if ( r.IsEmpty() ) return true; if ( !m_refData ) { - InitRect(x, y, width, height); + InitRect(r.x, r.y, r.width, r.height); } else { AllocExclusive(); GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); } @@ -181,15 +176,9 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) return true; } -bool wxRegion::Union( const wxRect& rect ) -{ - return Union( rect.x, rect.y, rect.width, rect.height ); -} - -bool wxRegion::Union( const wxRegion& region ) +bool wxRegion::DoUnionWithRegion( const wxRegion& region ) { - if (region.IsNull()) - return false; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); if (!m_refData) { @@ -206,24 +195,9 @@ bool wxRegion::Union( const wxRegion& region ) return true; } -bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) -{ - wxRegion reg( x, y, width, height ); - - return Intersect( reg ); -} - -bool wxRegion::Intersect( const wxRect& rect ) -{ - wxRegion reg( rect ); - - return Intersect( reg ); -} - -bool wxRegion::Intersect( const wxRegion& region ) +bool wxRegion::DoIntersect( const wxRegion& region ) { - if (region.IsNull()) - return false; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); if (!m_refData) { @@ -238,22 +212,9 @@ bool wxRegion::Intersect( const wxRegion& region ) return true; } -bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::DoSubtract( const wxRegion& region ) { - wxRegion reg( x, y, width, height ); - return Subtract( reg ); -} - -bool wxRegion::Subtract( const wxRect& rect ) -{ - wxRegion reg( rect ); - return Subtract( reg ); -} - -bool wxRegion::Subtract( const wxRegion& region ) -{ - if (region.IsNull()) - return false; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); if (!m_refData) { @@ -268,22 +229,9 @@ bool wxRegion::Subtract( const wxRegion& region ) return true; } -bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) +bool wxRegion::DoXor( const wxRegion& region ) { - wxRegion reg( x, y, width, height ); - return Xor( reg ); -} - -bool wxRegion::Xor( const wxRect& rect ) -{ - wxRegion reg( rect ); - return Xor( reg ); -} - -bool wxRegion::Xor( const wxRegion& region ) -{ - if (region.IsNull()) - return false; + wxCHECK_MSG( region.Ok(), false, _T("invalid region") ); if (!m_refData) { @@ -297,7 +245,7 @@ bool wxRegion::Xor( const wxRegion& region ) return true; } -bool wxRegion::Offset( wxCoord x, wxCoord y ) +bool wxRegion::DoOffset( wxCoord x, wxCoord y ) { if (!m_refData) return false; @@ -313,7 +261,7 @@ bool wxRegion::Offset( wxCoord x, wxCoord y ) // wxRegion tests // ---------------------------------------------------------------------------- -void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const +bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const { if ( m_refData ) { @@ -323,6 +271,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const y = rect.y; w = rect.width; h = rect.height; + + return true; } else { @@ -330,17 +280,12 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const y = 0; w = -1; h = -1; - } -} -wxRect wxRegion::GetBox() const -{ - wxCoord x, y, w, h; - GetBox( x, y, w, h ); - return wxRect( x, y, w, h ); + return false; + } } -bool wxRegion::Empty() const +bool wxRegion::IsEmpty() const { if (!m_refData) return true; @@ -348,7 +293,7 @@ bool wxRegion::Empty() const return gdk_region_empty( M_REGIONDATA->m_region ); } -wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const +wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const { if (!m_refData) return wxOutRegion; @@ -359,16 +304,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const return wxOutRegion; } -wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const +wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const { if (!m_refData) return wxOutRegion; GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; + rect.x = r.x; + rect.y = r.y; + rect.width = r.width; + rect.height = r.height; GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect ); switch (res) { @@ -379,16 +324,6 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) return wxOutRegion; } -wxRegionContain wxRegion::Contains(const wxPoint& pt) const -{ - return Contains( pt.x, pt.y ); -} - -wxRegionContain wxRegion::Contains(const wxRect& rect) const -{ - return Contains( rect.x, rect.y, rect.width, rect.height ); -} - GdkRegion *wxRegion::GetRegion() const { if (!m_refData) @@ -401,30 +336,33 @@ GdkRegion *wxRegion::GetRegion() const // wxRegionIterator // ---------------------------------------------------------------------------- -class wxRIRefData: public wxObjectRefData +wxRegionIterator::wxRegionIterator() { -public: - wxRIRefData() { Init(); } - virtual ~wxRIRefData(); - - void CreateRects( const wxRegion& r ); - - void Init() { m_rects = NULL; m_numRects = 0; } + Init(); + Reset(); +} - wxRect *m_rects; - size_t m_numRects; -}; +wxRegionIterator::wxRegionIterator( const wxRegion& region ) +{ + Init(); + Reset(region); +} -wxRIRefData::~wxRIRefData() +void wxRegionIterator::Init() { - delete [] m_rects; + m_rects = NULL; + m_numRects = 0; } -void wxRIRefData::CreateRects( const wxRegion& region ) +wxRegionIterator::~wxRegionIterator() { - delete [] m_rects; + wxDELETEA(m_rects); +} - Init(); +void wxRegionIterator::CreateRects( const wxRegion& region ) +{ + wxDELETEA(m_rects); + m_numRects = 0; GdkRegion *gdkregion = region.GetRegion(); if (!gdkregion) @@ -451,28 +389,16 @@ void wxRIRefData::CreateRects( const wxRegion& region ) g_free( gdkrects ); } -wxRegionIterator::wxRegionIterator() -{ - m_refData = new wxRIRefData(); - Reset(); -} - -wxRegionIterator::wxRegionIterator( const wxRegion& region ) -{ - m_refData = new wxRIRefData(); - Reset(region); -} - void wxRegionIterator::Reset( const wxRegion& region ) { m_region = region; - ((wxRIRefData*)m_refData)->CreateRects(region); + CreateRects(region); Reset(); } bool wxRegionIterator::HaveRects() const { - return m_current < ((wxRIRefData*)m_refData)->m_numRects; + return m_current < m_numRects; } wxRegionIterator& wxRegionIterator::operator ++ () @@ -486,6 +412,7 @@ wxRegionIterator& wxRegionIterator::operator ++ () wxRegionIterator wxRegionIterator::operator ++ (int) { wxRegionIterator tmp = *this; + if (HaveRects()) ++m_current; @@ -496,35 +423,55 @@ wxCoord wxRegionIterator::GetX() const { wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].x; + return m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].y; + return m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].width; + return m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); - return ((wxRIRefData*)m_refData)->m_rects[m_current].height; + return m_rects[m_current].height; } wxRect wxRegionIterator::GetRect() const { wxRect r; if( HaveRects() ) - r = ((wxRIRefData*)m_refData)->m_rects[m_current]; + r = m_rects[m_current]; return r; } + +wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri) +{ + wxDELETEA(m_rects); + + m_current = ri.m_current; + m_numRects = ri.m_numRects; + if ( m_numRects ) + { + m_rects = new wxRect[m_numRects]; + for ( unsigned int n = 0; n < m_numRects; n++ ) + m_rects[n] = ri.m_rects[n]; + } + else + { + m_rects = NULL; + } + + return *this; +}