X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c89f5c02b1ecc6098b21b39b01509dd387c1cb34..260b9be703471b1de8b53e50c8af360886bb1ee3:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 2e40166981..71cc667463 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -12,20 +12,17 @@ // declarations // ============================================================================ -#ifdef __GNUG__ - #pragma implementation "region.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#include "wx/region.h" - -#include -#include +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" +#include "wx/region.h" #include "wx/log.h" +#include "wx/gtk/private.h" + // ---------------------------------------------------------------------------- // wxRegionRefData: private class containing the information about the region @@ -38,19 +35,13 @@ public: { m_region = NULL; } - + wxRegionRefData(const wxRegionRefData& refData) + : wxObjectRefData() { -#ifdef __WXGTK20__ m_region = gdk_region_copy(refData.m_region); -#else - m_region = gdk_region_new(); - GdkRegion *regCopy = gdk_regions_union(m_region, refData.m_region); - gdk_region_destroy(m_region); - m_region = regCopy; -#endif } - + ~wxRegionRefData() { if (m_region) @@ -67,8 +58,8 @@ public: #define M_REGIONDATA ((wxRegionRefData *)m_refData) #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData)) -IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject); -IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject); +IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject) // ---------------------------------------------------------------------------- // wxRegion construction @@ -83,16 +74,16 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) rect.y = y; rect.width = w; rect.height = h; - + m_refData = new wxRegionRefData(); - -#ifdef __WXGTK20__ - M_REGIONDATA->m_region = gdk_region_rectangle( rect ); -#else - GdkRegion *reg = gdk_region_new(); - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); -#endif + + M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); +} + +wxRegion::wxRegion( GdkRegion *region ) +{ + m_refData = new wxRegionRefData(); + M_REGIONDATA->m_region = gdk_region_copy( region ); } wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) @@ -138,12 +129,12 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const // wxRegion comparison // ---------------------------------------------------------------------------- -bool wxRegion::operator==( const wxRegion& region ) +bool wxRegion::operator==( 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); @@ -160,34 +151,27 @@ void wxRegion::Clear() bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - GdkRectangle rect; - rect.x = x; - rect.y = y; - rect.width = width; - rect.height = height; - - if (!m_refData) + // 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 ) + return TRUE; + + if ( !m_refData ) { - m_refData = new wxRegionRefData(); -#ifdef __WXGTK20__ - M_REGIONDATA->m_region = gdk_region_rectangle( rect ); -#else - GdkRegion *reg = gdk_region_new(); - M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect ); - gdk_region_destroy( reg ); -#endif + InitRect(x, y, width, height); } else { AllocExclusive(); -#ifdef __WXGTK20__ + GdkRectangle rect; + rect.x = x; + rect.y = y; + rect.width = width; + rect.height = height; + gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); -#else - GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; -#endif } return TRUE; @@ -213,13 +197,7 @@ bool wxRegion::Union( const wxRegion& region ) AllocExclusive(); } -#ifdef __WXGTK20__ gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() ); -#else - GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; -#endif return TRUE; } @@ -234,7 +212,7 @@ bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) bool wxRegion::Intersect( const wxRect& rect ) { wxRegion reg( rect ); - + return Intersect( reg ); } @@ -245,24 +223,13 @@ bool wxRegion::Intersect( const wxRegion& region ) if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - - // leave here - return TRUE; - } - else - { - AllocExclusive(); + // intersecting with invalid region doesn't make sense + return FALSE; } -#ifdef __WXGTK20__ + AllocExclusive(); + gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() ); -#else - GdkRegion *reg = gdk_regions_intersect( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; -#endif return TRUE; } @@ -286,21 +253,13 @@ bool wxRegion::Subtract( const wxRegion& region ) if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - else - { - AllocExclusive(); + // subtracting from an invalid region doesn't make sense + return FALSE; } -#ifdef __WXGTK20__ + AllocExclusive(); + gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() ); -#else - GdkRegion *reg = gdk_regions_subtract( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; -#endif return TRUE; } @@ -324,21 +283,24 @@ bool wxRegion::Xor( const wxRegion& region ) if (!m_refData) { - m_refData = new wxRegionRefData(); - M_REGIONDATA->m_region = gdk_region_new(); - } - else - { - AllocExclusive(); + return FALSE; } -#ifdef __WXGTK20__ + AllocExclusive(); + gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() ); -#else - GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() ); - gdk_region_destroy( M_REGIONDATA->m_region ); - M_REGIONDATA->m_region = reg; -#endif + + return TRUE; +} + +bool wxRegion::Offset( wxCoord x, wxCoord y ) +{ + if (!m_refData) + return FALSE; + + AllocExclusive(); + + gdk_region_offset( M_REGIONDATA->m_region, x, y ); return TRUE; } @@ -374,18 +336,6 @@ wxRect wxRegion::GetBox() const return wxRect( x, y, w, h ); } -bool wxRegion::Offset( wxCoord x, wxCoord y ) -{ - if (!m_refData) - return FALSE; - - AllocExclusive(); - - gdk_region_offset( M_REGIONDATA->m_region, x, y ); - - return TRUE; -} - bool wxRegion::Empty() const { if (!m_refData) @@ -447,61 +397,39 @@ GdkRegion *wxRegion::GetRegion() const // wxRegionIterator // ---------------------------------------------------------------------------- -#ifndef __WXGTK20__ - -// the following structures must match the private structures -// in X11 region code ( xc/lib/X11/region.h ) - -// this makes the Region type transparent -// and we have access to the region rectangles - -#include - -struct _XBox { - short x1, x2, y1, y2; -}; - -struct _XRegion { - long size , numRects; - _XBox *rects, extents; -}; - -#endif - class wxRIRefData: public wxObjectRefData { public: + wxRIRefData() { Init(); } + virtual ~wxRIRefData(); + + void CreateRects( const wxRegion& r ); - wxRIRefData() : m_rects(0), m_numRects(0){} - ~wxRIRefData(); + void Init() { m_rects = NULL; m_numRects = 0; } wxRect *m_rects; size_t m_numRects; - - void CreateRects( const wxRegion& r ); }; wxRIRefData::~wxRIRefData() { - delete m_rects; + delete [] m_rects; } void wxRIRefData::CreateRects( const wxRegion& region ) { - if (m_rects) - delete m_rects; + delete [] m_rects; + + Init(); - m_rects = 0; - m_numRects = 0; - GdkRegion *gdkregion = region.GetRegion(); - if (!gdkregion) return; - -#ifdef __WXGTK20__ - GdkRectangles *gdkrects = NULL; + if (!gdkregion) + return; + + GdkRectangle *gdkrects = NULL; gint numRects = 0; - gdk_region_get_rectangles( gdkregion, &gdkrect, &numRects ); - + gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); + m_numRects = numRects; if (numRects) { @@ -516,27 +444,7 @@ void wxRIRefData::CreateRects( const wxRegion& region ) wr.height = gr.height; } } - g_delete( gdkrects ); // delete [] -#else - Region r = ((GdkRegionPrivate *)gdkregion)->xregion; - if (r) - { - m_numRects = r->numRects; - if (m_numRects) - { - m_rects = new wxRect[m_numRects]; - for (size_t i=0; i < m_numRects; ++i) - { - _XBox &xr = r->rects[i]; - wxRect &wr = m_rects[i]; - wr.x = xr.x1; - wr.y = xr.y1; - wr.width = xr.x2-xr.x1; - wr.height = xr.y2-xr.y1; - } - } - } -#endif + g_free( gdkrects ); } wxRegionIterator::wxRegionIterator() @@ -563,42 +471,48 @@ bool wxRegionIterator::HaveRects() const return m_current < ((wxRIRefData*)m_refData)->m_numRects; } -wxRegionIterator::operator bool () const +wxRegionIterator& wxRegionIterator::operator ++ () { - return HaveRects(); -} + if (HaveRects()) + ++m_current; -void wxRegionIterator::operator ++ () -{ - if (HaveRects()) ++m_current; + return *this; } -void wxRegionIterator::operator ++ (int) +wxRegionIterator wxRegionIterator::operator ++ (int) { - if (HaveRects()) ++m_current; + wxRegionIterator tmp = *this; + if (HaveRects()) + ++m_current; + + return tmp; } wxCoord wxRegionIterator::GetX() const { - if( !HaveRects() ) return 0; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].x; } wxCoord wxRegionIterator::GetY() const { - if( !HaveRects() ) return 0; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].y; } wxCoord wxRegionIterator::GetW() const { - if( !HaveRects() ) return -1; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].width; } wxCoord wxRegionIterator::GetH() const { - if( !HaveRects() ) return -1; + wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") ); + return ((wxRIRefData*)m_refData)->m_rects[m_current].height; }