GetNumberOfLines on GTK doesn't count wrapped lines again...

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

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index fee7f0eb263c615b781601e3ebea23eaee81f143..acad6e5f64bc112960366c008621daf6f6939959 100644 (file)
--- 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
 // Purpose:
 // Author:      Robert Roebling
 // Modified:    VZ at 05.10.00: use AllocExclusive(), comparison fixed


@@ -12,19 +12,38 @@
 // 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 WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/gtk1/private.h"
+
+
+// ----------------------------------------------------------------------------
+// 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; }
+
+private:
+    GdkRegion *m_region;
+};
+

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


@@ -37,20 +56,14 @@ public:
     {
         m_region = NULL;
     }
     {
         m_region = NULL;
     }

-    
+

     wxRegionRefData(const wxRegionRefData& refData)
     wxRegionRefData(const wxRegionRefData& refData)

+        : wxObjectRefData()

     {
     {

-#ifdef __WXGTK20__
-        m_region = gdk_region_copy(refData.m_region);
-#else
-        m_region = gdk_region_new();
-        GdkRegion *regCopy = gdk_regions_union(m_region, refData.m_region);
-        gdk_region_destroy(m_region);
-        m_region = regCopy;
-#endif
+        m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);

     }
     }

-    
-    ~wxRegionRefData()
+
+    virtual ~wxRegionRefData()

     {
         if (m_region)
             gdk_region_destroy( m_region );
     {
         if (m_region)
             gdk_region_destroy( m_region );


@@ -66,8 +79,8 @@ public:
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)

 
 // ----------------------------------------------------------------------------
 // wxRegion construction
 
 // ----------------------------------------------------------------------------
 // wxRegion construction


@@ -82,16 +95,16 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     rect.y = y;
     rect.width = w;
     rect.height = h;
     rect.y = y;
     rect.width = w;
     rect.height = h;

-    
+

     m_refData = new wxRegionRefData();
     m_refData = new wxRegionRefData();

-    
-#ifdef __WXGTK20__
-    M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
-#else
-    GdkRegion *reg = gdk_region_new();
-    M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
-    gdk_region_destroy( reg );
-#endif
+
+    M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect );
+}
+
+wxRegion::wxRegion( GdkRegion *region )
+{
+    m_refData = new wxRegionRefData();
+    M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);

 }
 
 wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
 }
 
 wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )


@@ -137,13 +150,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);
 }


@@ -157,47 +165,35 @@ 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;
-    
-    if (!m_refData)
+    // 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 )

     {
     {

-        m_refData = new wxRegionRefData();
-#ifdef __WXGTK20__
-        M_REGIONDATA->m_region = gdk_region_rectangle( &rect );
-#else
-        GdkRegion *reg = gdk_region_new();
-        M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
-        gdk_region_destroy( reg );
-#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 )
-{
-    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;
 {
     if (region.IsNull())
         return FALSE;


@@ -212,132 +208,77 @@ bool wxRegion::Union( const wxRegion& region )
         AllocExclusive();
     }
 
         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;
     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 )
-{
-    wxRegion reg( x, y, width, height );
-
-    return Intersect( reg );
-}
-
-bool wxRegion::Intersect( const wxRect& rect )
+bool wxRegion::DoIntersect( const wxRegion& region )

 {
 {

-    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)
     {
 
     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;
     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( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    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 )
+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();
-    }
-    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;
     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( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRect& rect )
+bool wxRegion::DoXor( const wxRegion& region )

 {
 {

-    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)
     {
 
     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;
     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;
 }
 
     return TRUE;
 }


@@ -346,7 +287,7 @@ bool wxRegion::Xor( const wxRegion& region )
 // 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 )
     {


@@ -356,6 +297,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
     {


@@ -363,29 +306,12 @@ 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)
         return TRUE;
 {
     if (!m_refData)
         return TRUE;


@@ -393,7 +319,7 @@ bool wxRegion::Empty() const
     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;


@@ -404,16 +330,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)
     {


@@ -424,16 +350,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)


@@ -446,8 +362,6 @@ 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 )
 
 // the following structures must match the private structures
 // in X11 region code ( xc/lib/X11/region.h )
 


@@ -465,7 +379,6 @@ struct _XRegion {
     _XBox *rects, extents;
 };
 
     _XBox *rects, extents;
 };
 

-#endif

 
 class wxRIRefData: public wxObjectRefData
 {
 
 class wxRIRefData: public wxObjectRefData
 {


@@ -483,40 +396,19 @@ public:
 
 wxRIRefData::~wxRIRefData()
 {
 
 wxRIRefData::~wxRIRefData()
 {

-    delete m_rects;
+    delete [] m_rects;

 }
 
 void wxRIRefData::CreateRects( const wxRegion& region )
 {
 }
 
 void wxRIRefData::CreateRects( const wxRegion& region )
 {

-    delete m_rects;
+    delete [] m_rects;

 
     Init();
 
     Init();

-    
+

     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 );
-    
-    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)
     {
     Region r = ((GdkRegionPrivate *)gdkregion)->xregion;
     if (r)
     {


@@ -535,7 +427,6 @@ void wxRIRefData::CreateRects( const wxRegion& region )
             }
         }
     }
             }
         }
     }

-#endif // GTK+ 2.0/1.x

 }
 
 wxRegionIterator::wxRegionIterator()
 }
 
 wxRegionIterator::wxRegionIterator()


@@ -562,42 +453,48 @@ bool wxRegionIterator::HaveRects() const
     return m_current < ((wxRIRefData*)m_refData)->m_numRects;
 }
 
     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
 {
 }
 
 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
 {
     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
 {
     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
 {
     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;
 }
 
     return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
 }
 


@@ -609,4 +506,3 @@ wxRect wxRegionIterator::GetRect() const
 
     return r;
 }
 
     return r;
 }

-