couple of typo/thinko bug fixes

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 8af2c03eee82a6c71b5e5076508cf1b988eefc8e..0332bd48b6b948c98ffb72cf36ca92ab602d277d 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -293,7 +293,7 @@ bool wxRegion::Xor( const wxRect& rect )
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())

-        return NULL;
+        return FALSE;

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {


@@ -322,7 +322,7 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
     y = 0;
     w = -1;
     h = -1;
     y = 0;
     w = -1;
     h = -1;

-    if (m_refData)
+    if (!m_refData)

         return;
 
     GdkRectangle rect;
         return;
 
     GdkRectangle rect;

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 8af2c03eee82a6c71b5e5076508cf1b988eefc8e..0332bd48b6b948c98ffb72cf36ca92ab602d277d 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -293,7 +293,7 @@ bool wxRegion::Xor( const wxRect& rect )
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())

-        return NULL;
+        return FALSE;

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {


@@ -322,7 +322,7 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
     y = 0;
     w = -1;
     h = -1;
     y = 0;
     w = -1;
     h = -1;

-    if (m_refData)
+    if (!m_refData)

         return;
 
     GdkRectangle rect;
         return;
 
     GdkRectangle rect;