wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/motif/region.cpp b/src/motif/region.cpp
index 3a8f5603d0a91936fa171a0b9687eeeeb9ee77a8..d4ced6405db74940d03cb09a86e2fa8f70e151c9 100644 (file)
--- a/src/motif/region.cpp
+++ b/src/motif/region.cpp
@@ -104,6 +104,14 @@ wxRegion::~wxRegion()
     // m_refData unrefed in ~wxObject
 }
 
+// Get the internal region handle
+WXRegion wxRegion::GetXRegion() const
+{
+    wxASSERT( m_refData !=NULL );
+
+    return (WXRegion) ((wxRegionRefData*)m_refData)->m_region;
+}
+
 //-----------------------------------------------------------------------------
 //# Modify region
 //-----------------------------------------------------------------------------
@@ -198,9 +206,7 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
             break ;
     }
 
-    // TODO combine region
-
-       return FALSE;
+  return FALSE;
 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
@@ -237,7 +243,7 @@ wxRect wxRegion::GetBox() const
 // Is region empty?
 bool wxRegion::Empty() const
 {
-       return m_refData ? XEmptyRegion(M_REGION) : FALSE;
+       return m_refData ? XEmptyRegion(M_REGION) : TRUE;
 }
 
 //-----------------------------------------------------------------------------