/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/region.cpp
+// Name: src/gtk1/region.cpp
// Purpose:
// Author: Robert Roebling
// Modified: VZ at 05.10.00: use AllocExclusive(), comparison fixed
#include "wx/wxprec.h"
#include "wx/region.h"
-#include "wx/log.h"
-#include "wx/gtk/private.h"
-#ifndef __WXGTK20__
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+#endif
+
+#include "wx/gtk1/private.h"
+
// ----------------------------------------------------------------------------
// wxGdkRegion: creates a new region in ctor and destroys in dtor
GdkRegion *m_region;
};
-#endif // __WXGTK20__
// ----------------------------------------------------------------------------
// wxRegionRefData: private class containing the information about the region
// ----------------------------------------------------------------------------
-class wxRegionRefData : public wxObjectRefData
+class wxRegionRefData : public wxGDIRefData
{
public:
wxRegionRefData()
}
wxRegionRefData(const wxRegionRefData& refData)
- : wxObjectRefData()
+ : wxGDIRefData()
{
-#ifdef __WXGTK20__
- m_region = gdk_region_copy(refData.m_region);
-#else
m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
-#endif
}
- ~wxRegionRefData()
+ virtual ~wxRegionRefData()
{
if (m_region)
gdk_region_destroy( m_region );
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::wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle )
{
GdkPoint *gdkpoints = new GdkPoint[n];
for ( size_t i = 0 ; i < n ; i++ )
// m_refData unrefed in ~wxObject
}
-wxObjectRefData *wxRegion::CreateRefData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const
{
return new wxRegionRefData;
}
-wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxRegionRefData(*(wxRegionRefData *)data);
}
// wxRegion comparison
// ----------------------------------------------------------------------------
-bool wxRegion::operator==( const wxRegion& region )
+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);
}
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;
-
-#ifdef __WXGTK20__
- gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
-#else
+ rect.x = r.x;
+ rect.y = r.y;
+ rect.width = r.width;
+ rect.height = r.height;
+
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;
}
-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;
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;
}
-bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoIntersect( const wxRegion& region )
{
- 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 )
-{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
if (!m_refData)
{
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;
}
-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.IsOk(), false, wxT("invalid region") );
if (!m_refData)
{
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;
}
-bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
- wxRegion reg( x, y, width, height );
- return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRect& rect )
+bool wxRegion::DoXor( const wxRegion& region )
{
- wxRegion reg( rect );
- return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRegion& region )
-{
- if (region.IsNull())
- return FALSE;
+ wxCHECK_MSG( region.IsOk(), false, wxT("invalid region") );
if (!m_refData)
{
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;
}
-bool wxRegion::Offset( wxCoord x, wxCoord y )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )
{
if (!m_refData)
return FALSE;
// 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 )
{
y = rect.y;
w = rect.width;
h = rect.height;
+
+ return true;
}
else
{
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;
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;
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)
{
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)
- return (GdkRegion*) NULL;
+ return NULL;
return M_REGIONDATA->m_region;
}
// wxRegionIterator
// ----------------------------------------------------------------------------
-#ifndef __WXGTK20__
-
// the following structures must match the private structures
// in X11 region code ( xc/lib/X11/region.h )
_XBox *rects, extents;
};
-#endif // GTK+ 1.x
-class wxRIRefData: public wxObjectRefData
+class wxRIRefData : public wxGDIRefData
{
public:
wxRIRefData() { Init(); }
if (!gdkregion)
return;
-#ifdef __WXGTK20__
- GdkRectangle *gdkrects = NULL;
- gint numRects = 0;
- gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
-
- m_numRects = numRects;
- if (numRects)
- {
- m_rects = new wxRect[m_numRects];
- for (size_t i=0; i < m_numRects; ++i)
- {
- GdkRectangle &gr = gdkrects[i];
- wxRect &wr = m_rects[i];
- wr.x = gr.x;
- wr.y = gr.y;
- wr.width = gr.width;
- wr.height = gr.height;
- }
- }
- g_free( gdkrects );
-#else // GTK+ 1.x
Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
if (r)
{
}
}
}
-#endif // GTK+ 2.0/1.x
}
wxRegionIterator::wxRegionIterator()
wxCoord wxRegionIterator::GetX() const
{
- wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
}
wxCoord wxRegionIterator::GetY() const
{
- wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
}
wxCoord wxRegionIterator::GetW() const
{
- wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
}
wxCoord wxRegionIterator::GetH() const
{
- wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+ wxCHECK_MSG( HaveRects(), 0, wxT("invalid wxRegionIterator") );
return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
}
return r;
}
-
projects / wxWidgets.git / blobdiff