fix Union(empty rect) bug

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index e1394a48b42cd6b9a77c081f10ff8b8929b0e252..7ca7653e2aa9bc408d5df4492009bcb132df9bab 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -185,6 +185,12 @@ 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;

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index e1394a48b42cd6b9a77c081f10ff8b8929b0e252..7ca7653e2aa9bc408d5df4492009bcb132df9bab 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -185,6 +185,12 @@ 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;