X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57f2b902bc98b0764d9cd830bdaad2d6213123c2..8df26961603924444b44272d34e0c2cab95cfdb5:/src/gtk1/region.cpp?ds=sidebyside

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index e1394a48b4..b8f140cb72 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/region.cpp
+// Name:        src/gtk1/region.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
@@ -12,21 +12,21 @@
 // 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 WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/gtk1/private.h"
 
-#ifndef __WXGTK20__
 
 // ----------------------------------------------------------------------------
 // wxGdkRegion: creates a new region in ctor and destroys in dtor
@@ -44,13 +44,12 @@ private:
     GdkRegion *m_region;
 };
 
-#endif // __WXGTK20__
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region
 // ----------------------------------------------------------------------------
 
-class wxRegionRefData : public wxObjectRefData
+class wxRegionRefData : public wxGDIRefData
 {
 public:
     wxRegionRefData()
@@ -59,16 +58,12 @@ public:
     }
 
     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 );
@@ -103,21 +98,13 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 
     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 )
@@ -149,12 +136,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);
 }
@@ -163,13 +150,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // 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);
 }
@@ -183,45 +165,35 @@ void wxRegion::Clear()
     UnRef();
 }
 
-bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoUnionWithRect(const wxRect& r)
 {
-    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 ( r.IsEmpty() )
+        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(r.x, r.y, r.width, r.height);
     }
     else
     {
         AllocExclusive();
 
-#ifdef __WXGTK20__
+        GdkRectangle rect;
+        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 );
-#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;
 }
 
-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;
@@ -236,132 +208,77 @@ bool wxRegion::Union( const wxRegion& region )
         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.Ok(), false, _T("invalid region") );
 
     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__
-    gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
-#else
+    AllocExclusive();
+
     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 )
-{
-    wxRegion reg( x, y, width, height );
-    return Subtract( reg );
-}
-
-bool wxRegion::Subtract( const wxRect& rect )
+bool wxRegion::DoSubtract( const wxRegion& region )
 {
-    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)
     {
-        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__
-    gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
-#else
+    AllocExclusive();
+
     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 )
+bool wxRegion::DoXor( const wxRegion& region )
 {
-    wxRegion reg( x, y, width, height );
-    return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRegion& region )
-{
-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
 
     if (!m_refData)
     {
-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
-    }
-    else
-    {
-        AllocExclusive();
+        return FALSE;
     }
 
-#ifdef __WXGTK20__
-    gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
-#else
+    AllocExclusive();
+
     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::DoOffset( wxCoord x, wxCoord y )
+{
+    if (!m_refData)
+        return FALSE;
+
+    AllocExclusive();
+
+    gdk_region_offset( M_REGIONDATA->m_region, x, y );
 
     return TRUE;
 }
@@ -370,7 +287,7 @@ bool wxRegion::Xor( const wxRegion& region )
 // 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 )
     {
@@ -380,6 +297,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
     {
@@ -387,29 +306,12 @@ 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 );
-}
-
-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 false;
+    }
 }
 
-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const
 {
     if (!m_refData)
         return TRUE;
@@ -417,7 +319,7 @@ bool wxRegion::Empty() const
     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;
@@ -428,16 +330,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)
     {
@@ -448,16 +350,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)
@@ -470,8 +362,6 @@ GdkRegion *wxRegion::GetRegion() const
 // wxRegionIterator
 // ----------------------------------------------------------------------------
 
-#ifndef __WXGTK20__
-
 // the following structures must match the private structures
 // in X11 region code ( xc/lib/X11/region.h )
 
@@ -489,9 +379,8 @@ struct _XRegion {
     _XBox *rects, extents;
 };
 
-#endif
 
-class wxRIRefData: public wxObjectRefData
+class wxRIRefData : public wxGDIRefData
 {
 public:
     wxRIRefData() { Init(); }
@@ -520,27 +409,6 @@ void wxRIRefData::CreateRects( const wxRegion& region )
     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)
     {
@@ -559,7 +427,6 @@ void wxRIRefData::CreateRects( const wxRegion& region )
             }
         }
     }
-#endif // GTK+ 2.0/1.x
 }
 
 wxRegionIterator::wxRegionIterator()
@@ -586,42 +453,48 @@ bool wxRegionIterator::HaveRects() const
     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;
 }
 
@@ -633,4 +506,3 @@ wxRect wxRegionIterator::GetRect() const
 
     return r;
 }
-