X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e691f46b2ec1b5dbbff2e51131e3c532e688a89..59d04dff037f66e9e73b389de72835211f5f0bcd:/src/gtk1/region.cpp?ds=sidebyside

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index f184e4d795..7ca7653e2a 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -26,6 +26,26 @@
 
 #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
 // ----------------------------------------------------------------------------
@@ -37,19 +57,17 @@ public:
     {
         m_region = NULL;
     }
-    
+
     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;
+        m_region = gdk_regions_union(wxGdkRegion(), refData.m_region);
 #endif
     }
-    
+
     ~wxRegionRefData()
     {
         if (m_region)
@@ -66,8 +84,8 @@ public:
 #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
@@ -82,15 +100,23 @@ void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     rect.y = y;
     rect.width = w;
     rect.height = h;
-    
+
     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 );
+    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
 }
 
@@ -142,7 +168,7 @@ bool wxRegion::operator==( const wxRegion& region )
     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);
@@ -159,21 +185,25 @@ void wxRegion::Clear()
 
 bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord 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 ( !width || !height )
+        return TRUE;
+
     GdkRectangle rect;
     rect.x = x;
     rect.y = y;
     rect.width = width;
     rect.height = height;
-    
+
     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 );
+        M_REGIONDATA->m_region = gdk_region_union_with_rect(wxGdkRegion(), &rect);
 #endif
     }
     else
@@ -233,7 +263,7 @@ bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 bool wxRegion::Intersect( const wxRect& rect )
 {
     wxRegion reg( rect );
-    
+
     return Intersect( reg );
 }
 
@@ -246,8 +276,8 @@ bool wxRegion::Intersect( const wxRegion& region )
     {
         m_refData = new wxRegionRefData();
         M_REGIONDATA->m_region = gdk_region_new();
-        
-        // leave here 
+
+        // leave here
         return TRUE;
     }
     else
@@ -470,37 +500,37 @@ struct _XRegion {
 class wxRIRefData: public wxObjectRefData
 {
 public:
+    wxRIRefData() { Init(); }
+    virtual ~wxRIRefData();
 
-    wxRIRefData() : m_rects(0), m_numRects(0){}
-   ~wxRIRefData();
+    void CreateRects( const wxRegion& r );
+
+    void Init() { m_rects = NULL; m_numRects = 0; }
 
     wxRect *m_rects;
     size_t  m_numRects;
-
-    void CreateRects( const wxRegion& r );
 };
 
 wxRIRefData::~wxRIRefData()
 {
-    delete m_rects;
+    delete [] m_rects;
 }
 
 void wxRIRefData::CreateRects( const wxRegion& region )
 {
-    if (m_rects)
-      delete m_rects;
+    delete [] m_rects;
+
+    Init();
 
-    m_rects = 0;
-    m_numRects = 0;
-    
     GdkRegion *gdkregion = region.GetRegion();
-    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)
     {