Commit [ 1592301 ] [wxgtk] Fix wxCollapsiblePane to be flicker-free

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index e1394a48b42cd6b9a77c081f10ff8b8929b0e252..c87e5a05041a7d2989284cd63f7c859686ee4380 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed


@@ -12,39 +12,21 @@
 // declarations
 // ============================================================================
 
 // declarations
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "region.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/log.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/region.h"
 
 
 #include "wx/region.h"
 

-#include "wx/gtk/private.h"
-
-#ifndef __WXGTK20__
-
-// ----------------------------------------------------------------------------
-// wxGdkRegion: creates a new region in ctor and destroys in dtor
-// ----------------------------------------------------------------------------
-
-class wxGdkRegion
-{
-public:
-    wxGdkRegion() { m_region = gdk_region_new(); }
-    ~wxGdkRegion() { gdk_region_destroy(m_region); }
-
-    operator GdkRegion *() const { return m_region; }
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-private:
-    GdkRegion *m_region;
-};
+#include "wx/gtk/private.h"

 
 

-#endif // __WXGTK20__

 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region


@@ -61,14 +43,10 @@ public:
     wxRegionRefData(const wxRegionRefData& refData)
         : wxObjectRefData()
     {
     wxRegionRefData(const wxRegionRefData& refData)
         : wxObjectRefData()
     {

-#ifdef __WXGTK20__

         m_region = gdk_region_copy(refData.m_region);
         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 );
     {
         if (m_region)
             gdk_region_destroy( m_region );


@@ -103,21 +81,13 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 
     m_refData = new wxRegionRefData();
 
 
     m_refData = new wxRegionRefData();
 

-#ifdef __WXGTK20__

     M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
     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();
 }
 
 wxRegion::wxRegion( GdkRegion *region )
 {
     m_refData = new wxRegionRefData();

-#ifdef __WXGTK20__

     M_REGIONDATA->m_region = gdk_region_copy( region );
     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, int fillStyle )


@@ -163,13 +133,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
 // 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);
 }
     return gdk_region_equal(M_REGIONDATA->m_region,
                             M_REGIONDATA_OF(region)->m_region);
 }


@@ -183,48 +148,37 @@ void wxRegion::Clear()
     UnRef();
 }
 
     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();
 
     }
     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 );
         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;
+    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)
     {
 
     if (!m_refData)
     {


@@ -236,141 +190,78 @@ bool wxRegion::Union( const wxRegion& region )
         AllocExclusive();
     }
 
         AllocExclusive();
     }
 

-#ifdef __WXGTK20__

     gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
     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;
+    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 );
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

 
 

-    return Intersect( reg );
-}
+    if (!m_refData)
+    {
+        // intersecting with invalid region doesn't make sense
+        return false;
+    }

 
 

-bool wxRegion::Intersect( const wxRect& rect )
-{
-    wxRegion reg( rect );
+    AllocExclusive();
+
+    gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-    return Intersect( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Intersect( const wxRegion& region )
+bool wxRegion::DoSubtract( const wxRegion& region )

 {
 {

-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
-
-        // leave here
-        return TRUE;
-    }
-    else
-    {
-        AllocExclusive();
+        // subtracting from an invalid region doesn't make sense
+        return false;

     }
 
     }
 

-#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;
-}
+    AllocExclusive();

 
 

-bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Subtract( reg );
-}
+    gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-bool wxRegion::Subtract( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Subtract( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Subtract( 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)
     {
 
     if (!m_refData)
     {

-        m_refData = new wxRegionRefData();
-        M_REGIONDATA->m_region = gdk_region_new();
-    }
-    else
-    {
-        AllocExclusive();
+        return false;

     }
 
     }
 

-#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;
-}
+    AllocExclusive();

 
 

-bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Xor( reg );
-}
+    gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );

 
 

-bool wxRegion::Xor( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Xor( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Xor( const wxRegion& region )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )

 {
 {

-    if (region.IsNull())
-        return FALSE;
-

     if (!m_refData)
     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
-    GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
-    gdk_region_destroy( M_REGIONDATA->m_region );
-    M_REGIONDATA->m_region = reg;
-#endif
+    AllocExclusive();
+
+    gdk_region_offset( M_REGIONDATA->m_region, x, y );

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxRegion tests
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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 )
     {
 {
     if ( m_refData )
     {


@@ -380,6 +271,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = rect.y;
         w = rect.width;
         h = rect.height;
         y = rect.y;
         w = rect.width;
         h = rect.height;

+
+        return true;

     }
     else
     {
     }
     else
     {


@@ -387,37 +280,20 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = 0;
         w = -1;
         h = -1;
         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)
 {
     if (!m_refData)

-        return TRUE;
+        return true;

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


@@ -428,16 +304,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
         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;
 {
     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)
     {
     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {


@@ -448,16 +324,6 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     return wxOutRegion;
 }
 
     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)
 GdkRegion *wxRegion::GetRegion() const
 {
     if (!m_refData)


@@ -470,57 +336,38 @@ GdkRegion *wxRegion::GetRegion() const
 // wxRegionIterator
 // ----------------------------------------------------------------------------
 
 // wxRegionIterator
 // ----------------------------------------------------------------------------
 

-#ifndef __WXGTK20__
-
-// the following structures must match the private structures
-// in X11 region code ( xc/lib/X11/region.h )
-
-// this makes the Region type transparent
-// and we have access to the region rectangles
-
-#include <gdk/gdkprivate.h>
-
-struct _XBox {
-    short x1, x2, y1, y2;
-};
-
-struct _XRegion {
-    long   size , numRects;
-    _XBox *rects, extents;
-};
-
-#endif
-
-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)
         return;
 
 
     GdkRegion *gdkregion = region.GetRegion();
     if (!gdkregion)
         return;
 

-#ifdef __WXGTK20__

     GdkRectangle *gdkrects = NULL;
     gint numRects = 0;
     gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
     GdkRectangle *gdkrects = NULL;
     gint numRects = 0;
     gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );


@@ -540,97 +387,91 @@ void wxRIRefData::CreateRects( const wxRegion& region )
         }
     }
     g_free( gdkrects );
         }
     }
     g_free( gdkrects );

-#else // GTK+ 1.x
-    Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
-    if (r)
-    {
-        m_numRects = r->numRects;
-        if (m_numRects)
-        {
-            m_rects = new wxRect[m_numRects];
-            for (size_t i=0; i < m_numRects; ++i)
-            {
-                _XBox &xr = r->rects[i];
-                wxRect &wr = m_rects[i];
-                wr.x = xr.x1;
-                wr.y = xr.y1;
-                wr.width = xr.x2-xr.x1;
-                wr.height = xr.y2-xr.y1;
-            }
-        }
-    }
-#endif // GTK+ 2.0/1.x
-}
-
-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;
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;

-    ((wxRIRefData*)m_refData)->CreateRects(region);
+    CreateRects(region);

     Reset();
 }
 
 bool wxRegionIterator::HaveRects() const
 {
     Reset();
 }
 
 bool wxRegionIterator::HaveRects() const
 {

-    return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+    return m_current < 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
 {
 }
 
 wxCoord wxRegionIterator::GetX() const
 {

-    if( !HaveRects() ) return 0;
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+    return m_rects[m_current].x;

 }
 
 wxCoord wxRegionIterator::GetY() const
 {
 }
 
 wxCoord wxRegionIterator::GetY() const
 {

-    if( !HaveRects() ) return 0;
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+    return m_rects[m_current].y;

 }
 
 wxCoord wxRegionIterator::GetW() const
 {
 }
 
 wxCoord wxRegionIterator::GetW() const
 {

-    if( !HaveRects() ) return -1;
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+    return m_rects[m_current].width;

 }
 
 wxCoord wxRegionIterator::GetH() const
 {
 }
 
 wxCoord wxRegionIterator::GetH() const
 {

-    if( !HaveRects() ) return -1;
-    return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+    wxCHECK_MSG( HaveRects(), 0, _T("invalid wxRegionIterator") );
+
+    return m_rects[m_current].height;

 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
     if( HaveRects() )
 }
 
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
     if( HaveRects() )

-        r = ((wxRIRefData*)m_refData)->m_rects[m_current];
+        r = m_rects[m_current];

 
     return r;
 }
 
 
     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;
+}