X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1bf3ad3e8f34361824a801008d47833ac71dcb1..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/gtk/region.cpp diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp index 5807eabbee..0fd5a8ac44 100644 --- a/src/gtk/region.cpp +++ b/src/gtk/region.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/region.cpp +// Name: src/gtk/region.cpp // Purpose: // Author: Robert Roebling // Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed @@ -12,10 +12,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "region.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -24,28 +20,13 @@ #include "wx/wxprec.h" #include "wx/region.h" -#include "wx/log.h" -#include "wx/gtk/private.h" - -#ifndef __WXGTK20__ - -// ---------------------------------------------------------------------------- -// wxGdkRegion: creates a new region in ctor and destroys in dtor -// ---------------------------------------------------------------------------- - -class wxGdkRegion -{ -public: - wxGdkRegion() { m_region = gdk_region_new(); } - ~wxGdkRegion() { gdk_region_destroy(m_region); } - operator GdkRegion *() const { return m_region; } +#ifndef WX_PRECOMP + #include "wx/log.h" +#endif -private: - GdkRegion *m_region; -}; +#include "wx/gtk/private.h" -#endif // __WXGTK20__ // ---------------------------------------------------------------------------- // wxRegionRefData: private class containing the information about the region @@ -62,11 +43,7 @@ public: wxRegionRefData(const wxRegionRefData& refData) : wxObjectRefData() { -#ifdef __WXGTK20__ m_region = gdk_region_copy(refData.m_region); -#else - m_region = gdk_regions_union(wxGdkRegion(), refData.m_region); -#endif } ~wxRegionRefData() @@ -104,21 +81,13 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h) m_refData = new wxRegionRefData(); -#ifdef __WXGTK20__ M_REGIONDATA->m_region = gdk_region_rectangle( &rect ); -#else - M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect ); -#endif } wxRegion::wxRegion( GdkRegion *region ) { m_refData = new wxRegionRefData(); -#ifdef __WXGTK20__ M_REGIONDATA->m_region = gdk_region_copy( region ); -#else - M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region); -#endif } wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle ) @@ -164,11 +133,11 @@ 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 true; - if (!m_refData || !region.m_refData) return FALSE; + 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, @@ -190,7 +159,7 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) // rectangle results in an empty region which is definitely not what we // want if ( !width || !height ) - return TRUE; + return true; if ( !m_refData ) { @@ -206,16 +175,10 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) rect.width = width; rect.height = height; -#ifdef __WXGTK20__ 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; + return true; } bool wxRegion::Union( const wxRect& rect ) @@ -226,7 +189,7 @@ bool wxRegion::Union( const wxRect& rect ) bool wxRegion::Union( const wxRegion& region ) { if (region.IsNull()) - return FALSE; + return false; if (!m_refData) { @@ -238,15 +201,9 @@ 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; + return true; } bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) @@ -266,25 +223,19 @@ bool wxRegion::Intersect( const wxRect& rect ) bool wxRegion::Intersect( const wxRegion& region ) { if (region.IsNull()) - return FALSE; + return false; if (!m_refData) { // intersecting with invalid region doesn't make sense - return FALSE; + return false; } AllocExclusive(); -#ifdef __WXGTK20__ 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; + return true; } bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) @@ -302,25 +253,19 @@ bool wxRegion::Subtract( const wxRect& rect ) bool wxRegion::Subtract( const wxRegion& region ) { if (region.IsNull()) - return FALSE; + return false; if (!m_refData) { // subtracting from an invalid region doesn't make sense - return FALSE; + return false; } AllocExclusive(); -#ifdef __WXGTK20__ 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; + return true; } bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) @@ -338,36 +283,30 @@ bool wxRegion::Xor( const wxRect& rect ) bool wxRegion::Xor( const wxRegion& region ) { if (region.IsNull()) - return FALSE; + return false; if (!m_refData) { - return FALSE; + return false; } AllocExclusive(); -#ifdef __WXGTK20__ 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; + return true; } bool wxRegion::Offset( wxCoord x, wxCoord y ) { if (!m_refData) - return FALSE; + return false; AllocExclusive(); gdk_region_offset( M_REGIONDATA->m_region, x, y ); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -404,7 +343,7 @@ wxRect wxRegion::GetBox() const bool wxRegion::Empty() const { if (!m_refData) - return TRUE; + return true; return gdk_region_empty( M_REGIONDATA->m_region ); } @@ -462,27 +401,6 @@ 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 // GTK+ 1.x - class wxRIRefData: public wxObjectRefData { public: @@ -512,7 +430,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) if (!gdkregion) return; -#ifdef __WXGTK20__ GdkRectangle *gdkrects = NULL; gint numRects = 0; gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects ); @@ -532,26 +449,6 @@ void wxRIRefData::CreateRects( const wxRegion& region ) } } g_free( gdkrects ); -#else // GTK+ 1.x - 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 // GTK+ 2.0/1.x } wxRegionIterator::wxRegionIterator() @@ -631,4 +528,3 @@ wxRect wxRegionIterator::GetRect() const return r; } -