/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/region.cpp
+// Name: src/gtk/region.cpp
// Purpose:
// Author: Robert Roebling
// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
// declarations
// ============================================================================
-#ifdef __GNUG__
- #pragma implementation "region.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#include "wx/log.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/region.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
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()
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 )
// 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,
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;
+ // 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)
+ if ( !m_refData )
{
- 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
+ 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;
+ return true;
}
bool wxRegion::Union( const wxRect& rect )
bool wxRegion::Union( const wxRegion& region )
{
if (region.IsNull())
- return FALSE;
+ return false;
if (!m_refData)
{
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 )
bool wxRegion::Intersect( const wxRegion& region )
{
if (region.IsNull())
- return FALSE;
+ return false;
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;
+ return true;
}
bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::Subtract( const wxRegion& region )
{
if (region.IsNull())
- return FALSE;
+ return false;
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;
+ return true;
}
bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
bool wxRegion::Xor( const wxRegion& region )
{
if (region.IsNull())
- return FALSE;
+ return false;
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;
+ 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;
}
// ----------------------------------------------------------------------------
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)
- return TRUE;
+ return true;
return gdk_region_empty( M_REGIONDATA->m_region );
}
// 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 <gdk/gdkprivate.h>
-
-struct _XBox {
- short x1, x2, y1, y2;
-};
-
-struct _XRegion {
- long size , numRects;
- _XBox *rects, extents;
-};
-
-#endif
-
class wxRIRefData: public wxObjectRefData
{
public:
if (!gdkregion)
return;
-#ifdef __WXGTK20__
GdkRectangle *gdkrects = NULL;
gint numRects = 0;
gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
}
}
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()
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;
}
return r;
}
-
projects / wxWidgets.git / blobdiff