Try this again

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

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index a8f536416b1ec00e1e64deb0061e658e31e13d00..0b5130d9be124d19f97a7221dfb92463efd4617a 100644 (file)
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -149,6 +149,12 @@ void wxRegion::Clear()
 
 bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
+    // work around for XUnionRectWithRegion() bug: taking a union with an empty
+    // rect results in an empty region (at least XFree 3.3.6 and 4.0 have this
+    // problem)
+    if ( !width || !height )
+        return TRUE;
+
     XRectangle rect;
     rect.x = x;
     rect.y = y;
@@ -434,13 +440,13 @@ public:
 
 wxRIRefData::~wxRIRefData()
 {
-    delete m_rects;
+    delete [] m_rects;
 }
 
 void wxRIRefData::CreateRects( const wxRegion& region )
 {
     if (m_rects)
-      delete m_rects;
+      delete [] m_rects;
 
     m_rects = 0;
     m_numRects = 0;