X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..022a8a5af2763ae462ac56fe6d1d7bd6d4fe71c8:/src/gtk/region.cpp

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 4db9d7755f..a18c324df8 100644
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -19,11 +19,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/region.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 
-#include "wx/region.h"
 #include "wx/gtk/private.h"
 
 
@@ -31,7 +32,7 @@
 // wxRegionRefData: private class containing the information about the region
 // ----------------------------------------------------------------------------
 
-class wxRegionRefData : public wxObjectRefData
+class wxRegionRefData : public wxGDIRefData
 {
 public:
     wxRegionRefData()
@@ -40,12 +41,12 @@ public:
     }
 
     wxRegionRefData(const wxRegionRefData& refData)
-        : wxObjectRefData()
+        : wxGDIRefData()
     {
         m_region = gdk_region_copy(refData.m_region);
     }
 
-    ~wxRegionRefData()
+    virtual ~wxRegionRefData()
     {
         if (m_region)
             gdk_region_destroy( m_region );
@@ -118,12 +119,12 @@ wxRegion::~wxRegion()
     // 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);
 }
@@ -132,13 +133,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
-bool wxRegion::operator==( const wxRegion& region ) const
+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);
 }
@@ -152,43 +148,37 @@ void wxRegion::Clear()
     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 )
-        return TRUE;
+    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;
+        rect.x = r.x;
+        rect.y = r.y;
+        rect.width = r.width;
+        rect.height = r.height;
 
         gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
     }
 
-    return TRUE;
+    return true;
 }
 
-bool wxRegion::Union( const wxRect& rect )
+bool wxRegion::DoUnionWithRegion( const wxRegion& region )
 {
-    return Union( rect.x, rect.y, rect.width, rect.height );
-}
-
-bool wxRegion::Union( const wxRegion& region )
-{
-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
 
     if (!m_refData)
     {
@@ -202,117 +192,76 @@ bool wxRegion::Union( const wxRegion& region )
 
     gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
 
-    return TRUE;
+    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.Ok(), false, _T("invalid region") );
 
     if (!m_refData)
     {
         // intersecting with invalid region doesn't make sense
-        return FALSE;
+        return false;
     }
 
     AllocExclusive();
 
     gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
 
-    return TRUE;
+    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.Ok(), false, _T("invalid region") );
 
     if (!m_refData)
     {
         // subtracting from an invalid region doesn't make sense
-        return FALSE;
+        return false;
     }
 
     AllocExclusive();
 
     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
 
-    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 )
-{
-    wxRegion reg( rect );
-    return Xor( reg );
+    return true;
 }
 
-bool wxRegion::Xor( const wxRegion& region )
+bool wxRegion::DoXor( const wxRegion& region )
 {
-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
 
     if (!m_refData)
     {
-        return FALSE;
+        return false;
     }
 
     AllocExclusive();
 
     gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
 
-    return TRUE;
+    return true;
 }
 
-bool wxRegion::Offset( wxCoord x, wxCoord y )
+bool wxRegion::DoOffset( 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;
 }
 
 // ----------------------------------------------------------------------------
 // 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 )
     {
@@ -322,6 +271,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = rect.y;
         w = rect.width;
         h = rect.height;
+
+        return true;
     }
     else
     {
@@ -329,25 +280,20 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         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 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;
@@ -358,16 +304,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
         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)
     {
@@ -378,16 +324,6 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     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)
@@ -400,30 +336,33 @@ GdkRegion *wxRegion::GetRegion() const
 // wxRegionIterator
 // ----------------------------------------------------------------------------
 
-class wxRIRefData: public wxObjectRefData
+wxRegionIterator::wxRegionIterator()
 {
-public:
-    wxRIRefData() { Init(); }
-    virtual ~wxRIRefData();
-
-    void CreateRects( const wxRegion& r );
-
-    void Init() { m_rects = NULL; m_numRects = 0; }
+    Init();
+    Reset();
+}
 
-    wxRect *m_rects;
-    size_t  m_numRects;
-};
+wxRegionIterator::wxRegionIterator( const wxRegion& region )
+{
+    Init();
+    Reset(region);
+}
 
-wxRIRefData::~wxRIRefData()
+void wxRegionIterator::Init()
 {
-    delete [] m_rects;
+    m_rects = NULL;
+    m_numRects = 0;
 }
 
-void wxRIRefData::CreateRects( const wxRegion& region )
+wxRegionIterator::~wxRegionIterator()
 {
-    delete [] m_rects;
+    wxDELETEA(m_rects);
+}
 
-    Init();
+void wxRegionIterator::CreateRects( const wxRegion& region )
+{
+    wxDELETEA(m_rects);
+    m_numRects = 0;
 
     GdkRegion *gdkregion = region.GetRegion();
     if (!gdkregion)
@@ -450,28 +389,16 @@ void wxRIRefData::CreateRects( const wxRegion& region )
     g_free( gdkrects );
 }
 
-wxRegionIterator::wxRegionIterator()
-{
-    m_refData = new wxRIRefData();
-    Reset();
-}
-
-wxRegionIterator::wxRegionIterator( const wxRegion& region )
-{
-    m_refData = new wxRIRefData();
-    Reset(region);
-}
-
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;
-    ((wxRIRefData*)m_refData)->CreateRects(region);
+    CreateRects(region);
     Reset();
 }
 
 bool wxRegionIterator::HaveRects() const
 {
-    return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+    return m_current < m_numRects;
 }
 
 wxRegionIterator& wxRegionIterator::operator ++ ()
@@ -485,6 +412,7 @@ wxRegionIterator& wxRegionIterator::operator ++ ()
 wxRegionIterator wxRegionIterator::operator ++ (int)
 {
     wxRegionIterator tmp = *this;
+
     if (HaveRects())
         ++m_current;
 
@@ -495,35 +423,55 @@ wxCoord wxRegionIterator::GetX() const
 {
     wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
 
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+    return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {
     wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
 
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+    return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {
     wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
 
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+    return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {
     wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
 
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+    return m_rects[m_current].height;
 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
     if( HaveRects() )
-        r = ((wxRIRefData*)m_refData)->m_rects[m_current];
+        r = m_rects[m_current];
 
     return r;
 }
+
+wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
+{
+    wxDELETEA(m_rects);
+
+    m_current = ri.m_current;
+    m_numRects = ri.m_numRects;
+    if ( m_numRects )
+    {
+        m_rects = new wxRect[m_numRects];
+        for ( unsigned int n = 0; n < m_numRects; n++ )
+            m_rects[n] = ri.m_rects[n];
+    }
+    else
+    {
+        m_rects = NULL;
+    }
+
+    return *this;
+}