applied the workaround for XUnionRectWithRegion() returning ampty result if the rect...

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

diff --git a/src/motif/region.cpp b/src/motif/region.cpp
index fb3b1e3db2551e6b427f0bdc01a79689adca70bf..1bec3f26ceaf7892ce1ee4ce8daefaf8180de912 100644 (file)
--- a/src/motif/region.cpp
+++ b/src/motif/region.cpp
@@ -200,8 +200,17 @@ void wxRegion::Clear()
 }
 
 //! Combine rectangle (x, y, w, h) with this.
 }
 
 //! Combine rectangle (x, y, w, h) with this.

-bool wxRegion::Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op)
+bool
+wxRegion::Combine(wxCoord x, wxCoord y,
+                  wxCoord width, wxCoord height,
+                  wxRegionOp op)

 {
 {

+    // 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 ( op == wxRGN_OR && (!width || !height) )
+        return TRUE;
+

     // Don't change shared data
     if (!m_refData) {
         m_refData = new wxRegionRefData();
     // Don't change shared data
     if (!m_refData) {
         m_refData = new wxRegionRefData();

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 1f7f4d5929a542e77593410cf59e19fee0f42b15..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 )
 {
 
 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;
     XRectangle rect;
     rect.x = x;
     rect.y = y;