Use wxGtkString here too

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 20746fb14bde77d0282562de69f631629d707215..71cc667463f521cd646f8923f502bd867f02a18d 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -12,10 +12,6 @@
 // declarations
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "region.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -23,31 +19,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/log.h"
-
 #include "wx/region.h"
-
+#include "wx/log.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; }
-
-private:
-    GdkRegion *m_region;
-};
-
-#endif // __WXGTK20__
 
 // ----------------------------------------------------------------------------
 // wxRegionRefData: private class containing the information about the region
@@ -64,11 +39,7 @@ public:
     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);
-#endif
     }
 
     ~wxRegionRefData()
@@ -106,21 +77,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 )
@@ -166,7 +129,7 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
-bool wxRegion::operator==( const wxRegion& region )
+bool wxRegion::operator==( const wxRegion& region ) const
 {
     if (m_refData == region.m_refData) return TRUE;
 
@@ -208,13 +171,7 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord 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;
-#endif
     }
 
     return TRUE;
@@ -240,13 +197,7 @@ 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;
 }
@@ -278,13 +229,7 @@ bool wxRegion::Intersect( const wxRegion& region )
 
     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;
-#endif
 
     return TRUE;
 }
@@ -314,13 +259,7 @@ bool wxRegion::Subtract( const wxRegion& region )
 
     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;
-#endif
 
     return TRUE;
 }
@@ -349,13 +288,7 @@ bool wxRegion::Xor( const wxRegion& region )
 
     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;
-#endif
 
     return TRUE;
 }
@@ -464,27 +397,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 )
-
-// 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 // GTK+ 1.x
-
 class wxRIRefData: public wxObjectRefData
 {
 public:
@@ -514,7 +426,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 );
@@ -534,26 +445,6 @@ void wxRIRefData::CreateRects( const wxRegion& region )
         }
     }
     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()