/////////////////////////////////////////////////////////////////////////////
-// Name: region.cpp
+// Name: gtk/region.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/region.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
//-----------------------------------------------------------------------------
// wxRegion
class wxRegionRefData: public wxObjectRefData
{
- public:
-
- wxRegionRefData(void);
- ~wxRegionRefData(void);
-
- public:
+public:
+ wxRegionRefData();
+ ~wxRegionRefData();
GdkRegion *m_region;
wxList m_rects;
};
-wxRegionRefData::wxRegionRefData(void)
+wxRegionRefData::wxRegionRefData()
{
m_region = (GdkRegion *) NULL;
}
-wxRegionRefData::~wxRegionRefData(void)
+wxRegionRefData::~wxRegionRefData()
{
if (m_region) gdk_region_destroy( m_region );
-
+
wxNode *node = m_rects.First();
while (node)
{
#define M_REGIONDATA ((wxRegionRefData *)m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
-
-wxRegion::wxRegion( long x, long y, long w, long h )
+
+wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
{
m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new();
g_rect.height = rect.height;
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
gdk_region_destroy( reg );
-
+
wxNode *node = M_REGIONDATA->m_rects.First();
while (node)
{
}
}
-wxRegion::wxRegion(void)
+wxRegion::wxRegion()
{
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
-wxRegion::~wxRegion(void)
+wxRegion::~wxRegion()
{
}
bool wxRegion::operator == ( const wxRegion& region )
{
- return m_refData == region.m_refData;
+ return m_refData == region.m_refData;
}
bool wxRegion::operator != ( const wxRegion& region )
{
- return m_refData != region.m_refData;
+ return m_refData != region.m_refData;
}
-void wxRegion::Clear(void)
+void wxRegion::Clear()
{
UnRef();
m_refData = new wxRegionRefData();
M_REGIONDATA->m_region = gdk_region_new();
}
-bool wxRegion::Union( long x, long y, long width, long height )
+bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
GdkRectangle rect;
rect.x = x;
GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg;
-
+
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
-
+
return TRUE;
}
-bool wxRegion::Intersect( long x, long y, long width, long height )
+bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
wxRegion reg( x, y, width, height );
Intersect( reg );
return TRUE;
}
-bool wxRegion::Subtract( long x, long y, long width, long height )
+bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
wxRegion reg( x, y, width, height );
Subtract( reg );
return TRUE;
}
-bool wxRegion::Xor( long x, long y, long width, long height )
+bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{
wxRegion reg( x, y, width, height );
Xor( reg );
GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
gdk_region_destroy( M_REGIONDATA->m_region );
M_REGIONDATA->m_region = reg;
-
+
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
-
+
return TRUE;
}
-void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
+void wxRegion::GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const
{
x = 0;
y = 0;
w = -1;
h = -1;
- wxNode *node = GetRectList()->First();
- while (node)
- {
- wxRect *r = (wxRect*)node->Data();
- if (node == GetRectList()->First())
- {
- x = r->x;
- y = r->y;
- w = r->width;
- h = r->height;
- }
- else
- {
- if (r->x < x)
- {
- x = r->x;
- w += x - r->x;
- }
- if (r->y < y)
- {
- y = r->y;
- h += y - r->y;
- }
- if (r->width+r->x > x+w)
- {
- w = r->x + r->width - x;
- }
- if (r->height+r->y > y+h)
- {
- h = r->y + r->height - y;
- }
- }
- node = node->Next();
- }
+ GdkRectangle rect;
+ gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+ x = rect.x;
+ y = rect.y;
+ w = rect.width;
+ h = rect.height;
}
-wxRect wxRegion::GetBox(void) const
+wxRect wxRegion::GetBox() const
{
- long x = 0;
- long y = 0;
- long w = -1;
- long h = -1;
+ wxCoord x = 0;
+ wxCoord y = 0;
+ wxCoord w = -1;
+ wxCoord h = -1;
GetBox( x, y, w, h );
return wxRect( x, y, w, h );
}
-bool wxRegion::Empty(void) const
+bool wxRegion::Empty() const
{
return gdk_region_empty( M_REGIONDATA->m_region );
}
-wxRegionContain wxRegion::Contains( long x, long y ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
{
if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
return wxInRegion;
return wxOutRegion;
}
-wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
{
GdkRectangle rect;
rect.x = x;
return Contains( rect.x, rect.y, rect.width, rect.height );
}
-GdkRegion *wxRegion::GetRegion(void) const
+GdkRegion *wxRegion::GetRegion() const
{
return M_REGIONDATA->m_region;
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-
-wxRegionIterator::wxRegionIterator(void)
+
+wxRegionIterator::wxRegionIterator()
{
- m_current = 0;
+ Reset();
}
wxRegionIterator::wxRegionIterator( const wxRegion& region )
{
- m_region = region;
- m_current = 0;
+ Reset(region);
}
void wxRegionIterator::Reset( const wxRegion& region )
{
m_region = region;
- m_current = 0;
+ Reset();
}
-wxRegionIterator::operator bool (void) const
-{
- return m_current < m_region.GetRectList()->Number();
+wxRegionIterator::operator bool () const
+{
+ return m_current < (size_t)m_region.GetRectList()->Number();
}
-bool wxRegionIterator::HaveRects(void) const
-{
- return m_current < m_region.GetRectList()->Number();
+bool wxRegionIterator::HaveRects() const
+{
+ return m_current < (size_t)m_region.GetRectList()->Number();
}
-void wxRegionIterator::operator ++ (void)
+void wxRegionIterator::operator ++ ()
{
- if (m_current < m_region.GetRectList()->Number()) ++m_current;
+ if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
- if (m_current < m_region.GetRectList()->Number()) ++m_current;
+ if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
}
-long wxRegionIterator::GetX(void) const
+wxCoord wxRegionIterator::GetX() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
return r->x;
}
-long wxRegionIterator::GetY(void) const
+wxCoord wxRegionIterator::GetY() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
return r->y;
}
-long wxRegionIterator::GetW(void) const
+wxCoord wxRegionIterator::GetW() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
return r->width;
}
-long wxRegionIterator::GetH(void) const
+wxCoord wxRegionIterator::GetH() const
{
wxNode *node = m_region.GetRectList()->Nth( m_current );
if (!node) return 0;
projects / wxWidgets.git / blobdiff