Added chapter on collection and container classes to contents

[wxWidgets.git] / src / gtk / region.cpp

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 3003e15b58be1e1930ace077c1865acc18ad454c..9cf22c23eb193e2fd4001b9a75d399d54e907386 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        region.cpp
+// Name:        gtk/region.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,15 +13,9 @@
 
 #include "wx/region.h"
 
 
 #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
 
 //-----------------------------------------------------------------------------
 // wxRegion


@@ -29,12 +23,9 @@
 
 class wxRegionRefData: public wxObjectRefData
 {
 
 class wxRegionRefData: public wxObjectRefData
 {

-  public:
-  
+public:

     wxRegionRefData();
     ~wxRegionRefData();
     wxRegionRefData();
     ~wxRegionRefData();

-  
-  public:    

 
     GdkRegion  *m_region;
     wxList      m_rects;
 
     GdkRegion  *m_region;
     wxList      m_rects;


@@ -48,7 +39,7 @@ wxRegionRefData::wxRegionRefData()
 wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );
 wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );

-  
+

     wxNode *node = m_rects.First();
     while (node)
     {
     wxNode *node = m_rects.First();
     while (node)
     {


@@ -63,8 +54,8 @@ wxRegionRefData::~wxRegionRefData()
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
 #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();
 {
     m_refData = new wxRegionRefData();
     GdkRegion *reg = gdk_region_new();


@@ -73,8 +64,13 @@ wxRegion::wxRegion( long x, long y, long w, long h )
     rect.y = y;
     rect.width = w;
     rect.height = h;
     rect.y = y;
     rect.width = w;
     rect.height = h;

+#ifdef __WXGTK20__
+    gdk_region_union_with_rect( reg, &rect );
+    M_REGIONDATA->m_region = reg;
+#else

     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
     gdk_region_destroy( reg );
     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
     gdk_region_destroy( reg );

+#endif

     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
 }
 
     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
 }
 


@@ -87,8 +83,13 @@ wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
     rect.y = topLeft.y;
     rect.width = bottomRight.x - rect.x;
     rect.height = bottomRight.y - rect.y;
     rect.y = topLeft.y;
     rect.width = bottomRight.x - rect.x;
     rect.height = bottomRight.y - rect.y;

+#ifdef __WXGTK20__
+    gdk_region_union_with_rect( reg, &rect );
+    M_REGIONDATA->m_region = reg;
+#else

     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
     gdk_region_destroy( reg );
     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
     gdk_region_destroy( reg );

+#endif

     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
 }
 
     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
 }
 


@@ -101,22 +102,18 @@ wxRegion::wxRegion( const wxRect& rect )
     g_rect.y = rect.y;
     g_rect.width = rect.width;
     g_rect.height = rect.height;
     g_rect.y = rect.y;
     g_rect.width = rect.width;
     g_rect.height = rect.height;

+#ifdef __WXGTK20__
+    gdk_region_union_with_rect( reg, &g_rect );
+    M_REGIONDATA->m_region = reg;
+#else

     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
     gdk_region_destroy( reg );
     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)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
-        node = node->Next();
-    }
+#endif
+    M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );

 }
 
 wxRegion::wxRegion()
 {
 }
 
 wxRegion::wxRegion()
 {

-    m_refData = new wxRegionRefData();
-    M_REGIONDATA->m_region = gdk_region_new();

 }
 
 wxRegion::~wxRegion()
 }
 
 wxRegion::~wxRegion()


@@ -125,55 +122,78 @@ wxRegion::~wxRegion()
 
 bool wxRegion::operator == ( const wxRegion& region )
 {
 
 bool wxRegion::operator == ( const wxRegion& region )
 {

-    return m_refData == region.m_refData; 
+    return m_refData == region.m_refData;

 }
 
 bool wxRegion::operator != ( const wxRegion& region )
 {
 }
 
 bool wxRegion::operator != ( const wxRegion& region )
 {

-    return m_refData != region.m_refData; 
+    return m_refData != region.m_refData;

 }
 
 void wxRegion::Clear()
 {
     UnRef();
 }
 
 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;
     rect.y = y;
     rect.width = width;
     rect.height = height;
 {
     GdkRectangle rect;
     rect.x = x;
     rect.y = y;
     rect.width = width;
     rect.height = 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;
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        GdkRegion *reg = gdk_region_new();
+#ifdef __WXGTK20__
+        gdk_region_union_with_rect( reg, &rect );
+        M_REGIONDATA->m_region = reg;
+#else
+        M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
+        gdk_region_destroy( reg );
+#endif
+    }
+    else
+    {
+#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
+    }
+    

     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
     M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );

+

     return TRUE;
 }
 
 bool wxRegion::Union( const wxRect& rect )
 {
     return TRUE;
 }
 
 bool wxRegion::Union( const wxRect& rect )
 {

-    GdkRectangle g_rect;
-    g_rect.x = rect.x;
-    g_rect.y = rect.y;
-    g_rect.width = rect.width;
-    g_rect.height = rect.height;
-    GdkRegion *reg = gdk_region_union_with_rect( M_REGIONDATA->m_region, &g_rect );
-    gdk_region_destroy( M_REGIONDATA->m_region );
-    M_REGIONDATA->m_region = reg;
-    M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
-    return TRUE;
+    return Union( rect.x, rect.y, rect.width, rect.height );

 }
 
 bool wxRegion::Union( const wxRegion& region )
 {
 }
 
 bool wxRegion::Union( const wxRegion& region )
 {

+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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;
     GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
     gdk_region_destroy( M_REGIONDATA->m_region );
     M_REGIONDATA->m_region = reg;

-  
+#endif
+

     wxNode *node = region.GetRectList()->First();
     while (node)
     {
     wxNode *node = region.GetRectList()->First();
     while (node)
     {


@@ -181,12 +201,18 @@ bool wxRegion::Union( const wxRegion& region )
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }

-  
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxRegion::Intersect( long x, long y, long width, long height )
+bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+    

     wxRegion reg( x, y, width, height );
     Intersect( reg );
     return TRUE;
     wxRegion reg( x, y, width, height );
     Intersect( reg );
     return TRUE;


@@ -194,6 +220,12 @@ bool wxRegion::Intersect( long x, long y, long width, long height )
 
 bool wxRegion::Intersect( const wxRect& rect )
 {
 
 bool wxRegion::Intersect( const wxRect& rect )
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+    

     wxRegion reg( rect );
     Intersect( reg );
     return TRUE;
     wxRegion reg( rect );
     Intersect( reg );
     return TRUE;


@@ -201,14 +233,34 @@ bool wxRegion::Intersect( const wxRect& rect )
 
 bool wxRegion::Intersect( const wxRegion& region )
 {
 
 bool wxRegion::Intersect( const wxRegion& region )
 {

+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+        return TRUE;
+    }
+    
+#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;
     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( long x, long y, long width, long height )
+bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+

     wxRegion reg( x, y, width, height );
     Subtract( reg );
     return TRUE;
     wxRegion reg( x, y, width, height );
     Subtract( reg );
     return TRUE;


@@ -216,6 +268,12 @@ bool wxRegion::Subtract( long x, long y, long width, long height )
 
 bool wxRegion::Subtract( const wxRect& rect )
 {
 
 bool wxRegion::Subtract( const wxRect& rect )
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+

     wxRegion reg( rect );
     Subtract( reg );
     return TRUE;
     wxRegion reg( rect );
     Subtract( reg );
     return TRUE;


@@ -223,14 +281,33 @@ bool wxRegion::Subtract( const wxRect& rect )
 
 bool wxRegion::Subtract( const wxRegion& region )
 {
 
 bool wxRegion::Subtract( const wxRegion& region )
 {

+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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;
     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( long x, long y, long width, long height )
+bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+

     wxRegion reg( x, y, width, height );
     Xor( reg );
     return TRUE;
     wxRegion reg( x, y, width, height );
     Xor( reg );
     return TRUE;


@@ -238,6 +315,12 @@ bool wxRegion::Xor( long x, long y, long width, long height )
 
 bool wxRegion::Xor( const wxRect& rect )
 {
 
 bool wxRegion::Xor( const wxRect& rect )
 {

+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+

     wxRegion reg( rect );
     Xor( reg );
     return TRUE;
     wxRegion reg( rect );
     Xor( reg );
     return TRUE;


@@ -245,10 +328,23 @@ bool wxRegion::Xor( const wxRect& rect )
 
 bool wxRegion::Xor( const wxRegion& region )
 {
 
 bool wxRegion::Xor( const wxRegion& region )
 {

+    if (region.IsNull())
+        return FALSE;
+
+    if (!m_refData)
+    {
+        m_refData = new wxRegionRefData();
+        M_REGIONDATA->m_region = gdk_region_new();
+    }
+
+#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;
     GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
     gdk_region_destroy( M_REGIONDATA->m_region );
     M_REGIONDATA->m_region = reg;

-  
+#endif
+

     wxNode *node = region.GetRectList()->First();
     while (node)
     {
     wxNode *node = region.GetRectList()->First();
     while (node)
     {


@@ -256,77 +352,61 @@ bool wxRegion::Xor( const wxRegion& region )
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }

-  
+

     return TRUE;
 }
 
     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;
 {
     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();
-    }
+    if (!m_refData)
+        return;
+
+    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() 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() const
 {
     GetBox( x, y, w, h );
     return wxRect( x, y, w, h );
 }
 
 bool wxRegion::Empty() const
 {

+    if (!m_refData)
+        return TRUE;
+

     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
     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 (!m_refData)
+        return wxOutRegion;
+

     if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
         return wxInRegion;
     else
         return wxOutRegion;
 }
 
     if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
         return wxInRegion;
     else
         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

 {
 {

+    if (!m_refData)
+        return wxOutRegion;
+

     GdkRectangle rect;
     rect.x = x;
     rect.y = y;
     GdkRectangle rect;
     rect.x = x;
     rect.y = y;


@@ -354,11 +434,17 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
 
 GdkRegion *wxRegion::GetRegion() const
 {
 
 GdkRegion *wxRegion::GetRegion() const
 {

+    if (!m_refData)
+        return (GdkRegion*) NULL;
+

     return M_REGIONDATA->m_region;
 }
 
 wxList *wxRegion::GetRectList() const
 {
     return M_REGIONDATA->m_region;
 }
 
 wxList *wxRegion::GetRectList() const
 {

+    if (!m_refData)
+        return (wxList*) NULL;
+

     return &(M_REGIONDATA->m_rects);
 }
 
     return &(M_REGIONDATA->m_rects);
 }
 


@@ -367,42 +453,41 @@ wxList *wxRegion::GetRectList() const
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);

-  
+

 wxRegionIterator::wxRegionIterator()
 {
 wxRegionIterator::wxRegionIterator()
 {

-    m_current = 0;
+    Reset();

 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {
 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {

-    m_region = region;
-    m_current = 0;
+    Reset(region);

 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;

-    m_current = 0;
+    Reset();

 }
 
 }
 

-wxRegionIterator::operator bool () const 
-{ 
-    return m_current < m_region.GetRectList()->Number(); 
+wxRegionIterator::operator bool () const
+{
+    return m_current < (size_t)m_region.GetRectList()->Number();

 }
 
 }
 

-bool wxRegionIterator::HaveRects() 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 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)
 {
 }
 
 void wxRegionIterator::operator ++ (int)
 {

-    if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;

 }
 
 wxCoord wxRegionIterator::GetX() const
 }
 
 wxCoord wxRegionIterator::GetX() const