Fix scrolling bug where client size was reported wrong

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

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 648fa71e1723a5d2177f02807a7bdacd9bbf1c01..80fd038c6d5e9f5732d595f91c418a094af39c48 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


@@ -20,10 +20,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/region.h"
 #include "wx/wxprec.h"
 
 #include "wx/region.h"

-#include "wx/log.h"
-#include "wx/gtk/private.h"

 
 

-#ifndef __WXGTK20__
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif
+
+#include "wx/gtk1/private.h"
+

 
 // ----------------------------------------------------------------------------
 // wxGdkRegion: creates a new region in ctor and destroys in dtor
 
 // ----------------------------------------------------------------------------
 // wxGdkRegion: creates a new region in ctor and destroys in dtor


@@ -41,7 +44,6 @@ private:
     GdkRegion *m_region;
 };
 
     GdkRegion *m_region;
 };
 

-#endif // __WXGTK20__

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


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

-#ifdef __WXGTK20__
-        m_region = gdk_region_copy(refData.m_region);
-#else

         m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
         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 );


@@ -100,21 +98,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 );
-#else

     M_REGIONDATA->m_region = gdk_region_union_with_rect( wxGdkRegion(), &rect );
     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 );
-#else

     M_REGIONDATA->m_region = gdk_regions_union(wxGdkRegion(), region);
     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 )


@@ -160,7 +150,7 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 

-bool wxRegion::operator==( const wxRegion& region )
+bool wxRegion::operator==( const wxRegion& region ) const

 {
     if (m_refData == region.m_refData) return TRUE;
 
 {
     if (m_refData == region.m_refData) return TRUE;
 


@@ -202,13 +192,9 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
         rect.width = width;
         rect.height = height;
 
         rect.width = width;
         rect.height = height;
 

-#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;
         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;


@@ -234,13 +220,9 @@ 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;
 }


@@ -272,13 +254,9 @@ bool wxRegion::Intersect( const wxRegion& region )
 
     AllocExclusive();
 
 
     AllocExclusive();
 

-#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;
 }


@@ -308,13 +286,9 @@ bool wxRegion::Subtract( const wxRegion& region )
 
     AllocExclusive();
 
 
     AllocExclusive();
 

-#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;
 }


@@ -343,13 +317,9 @@ bool wxRegion::Xor( const wxRegion& region )
 
     AllocExclusive();
 
 
     AllocExclusive();
 

-#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

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -458,8 +428,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 )
 


@@ -477,7 +445,6 @@ struct _XRegion {
     _XBox *rects, extents;
 };
 
     _XBox *rects, extents;
 };
 

-#endif // GTK+ 1.x

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


@@ -508,27 +475,6 @@ void wxRIRefData::CreateRects( const wxRegion& region )
     if (!gdkregion)
         return;
 
     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)
     {


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

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

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


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

-