cleanup for 10.5

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

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index 4db9d7755f11db37bf19685302a4fe9a0ac15866..91eecba5e4bd3dae81ff755a7ccb85626bdedbdd 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -19,11 +19,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/region.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 #endif
 

-#include "wx/region.h"

 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 
 


@@ -45,7 +46,7 @@ public:
         m_region = gdk_region_copy(refData.m_region);
     }
 
         m_region = gdk_region_copy(refData.m_region);
     }
 

-    ~wxRegionRefData()
+    virtual ~wxRegionRefData()

     {
         if (m_region)
             gdk_region_destroy( m_region );
     {
         if (m_region)
             gdk_region_destroy( m_region );


@@ -132,13 +133,8 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 

-bool wxRegion::operator==( const wxRegion& region ) const
+bool wxRegion::DoIsEqual(const wxRegion& region) const

 {
 {

-    if (m_refData == region.m_refData) return TRUE;
-
-    if (!m_refData || !region.m_refData) return FALSE;
-
-    // compare the regions themselves, not the pointers to ref data!

     return gdk_region_equal(M_REGIONDATA->m_region,
                             M_REGIONDATA_OF(region)->m_region);
 }
     return gdk_region_equal(M_REGIONDATA->m_region,
                             M_REGIONDATA_OF(region)->m_region);
 }


@@ -152,43 +148,37 @@ void wxRegion::Clear()
     UnRef();
 }
 
     UnRef();
 }
 

-bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoUnionWithRect(const wxRect& r)

 {
     // 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
 {
     // 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;
+    if ( r.IsEmpty() )
+        return true;

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

-        InitRect(x, y, width, height);
+        InitRect(r.x, r.y, r.width, r.height);

     }
     else
     {
         AllocExclusive();
 
         GdkRectangle rect;
     }
     else
     {
         AllocExclusive();
 
         GdkRectangle rect;

-        rect.x = x;
-        rect.y = y;
-        rect.width = width;
-        rect.height = height;
+        rect.x = r.x;
+        rect.y = r.y;
+        rect.width = r.width;
+        rect.height = r.height;

 
         gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
     }
 
 
         gdk_region_union_with_rect( M_REGIONDATA->m_region, &rect );
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxRegion::Union( const wxRect& rect )
+bool wxRegion::DoUnionWithRegion( const wxRegion& region )

 {
 {

-    return Union( rect.x, rect.y, rect.width, rect.height );
-}
-
-bool wxRegion::Union( const wxRegion& region )
-{
-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

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


@@ -202,117 +192,76 @@ bool wxRegion::Union( const wxRegion& region )
 
     gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
 
 
     gdk_region_union( M_REGIONDATA->m_region, region.GetRegion() );
 

-    return TRUE;
-}
-
-bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-
-    return Intersect( reg );
-}
-
-bool wxRegion::Intersect( const wxRect& rect )
-{
-    wxRegion reg( rect );
-
-    return Intersect( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Intersect( const wxRegion& region )
+bool wxRegion::DoIntersect( const wxRegion& region )

 {
 {

-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

 
     if (!m_refData)
     {
         // intersecting with invalid region doesn't make sense
 
     if (!m_refData)
     {
         // intersecting with invalid region doesn't make sense

-        return FALSE;
+        return false;

     }
 
     AllocExclusive();
 
     gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
 
     }
 
     AllocExclusive();
 
     gdk_region_intersect( M_REGIONDATA->m_region, region.GetRegion() );
 

-    return TRUE;
-}
-
-bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
-{
-    wxRegion reg( x, y, width, height );
-    return Subtract( reg );
-}
-
-bool wxRegion::Subtract( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Subtract( reg );
+    return true;

 }
 
 }
 

-bool wxRegion::Subtract( const wxRegion& region )
+bool wxRegion::DoSubtract( const wxRegion& region )

 {
 {

-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

 
     if (!m_refData)
     {
         // subtracting from an invalid region doesn't make sense
 
     if (!m_refData)
     {
         // subtracting from an invalid region doesn't make sense

-        return FALSE;
+        return false;

     }
 
     AllocExclusive();
 
     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
 
     }
 
     AllocExclusive();
 
     gdk_region_subtract( M_REGIONDATA->m_region, region.GetRegion() );
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+bool wxRegion::DoXor( const wxRegion& region )

 {
 {

-    wxRegion reg( x, y, width, height );
-    return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRect& rect )
-{
-    wxRegion reg( rect );
-    return Xor( reg );
-}
-
-bool wxRegion::Xor( const wxRegion& region )
-{
-    if (region.IsNull())
-        return FALSE;
+    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );

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

-        return FALSE;
+        return false;

     }
 
     AllocExclusive();
 
     gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
 
     }
 
     AllocExclusive();
 
     gdk_region_xor( M_REGIONDATA->m_region, region.GetRegion() );
 

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxRegion::Offset( wxCoord x, wxCoord y )
+bool wxRegion::DoOffset( wxCoord x, wxCoord y )

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

-        return FALSE;
+        return false;

 
     AllocExclusive();
 
     gdk_region_offset( M_REGIONDATA->m_region, x, y );
 
 
     AllocExclusive();
 
     gdk_region_offset( M_REGIONDATA->m_region, x, y );
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxRegion tests
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxRegion tests
 // ----------------------------------------------------------------------------
 

-void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
+bool wxRegion::DoGetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const

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


@@ -322,6 +271,8 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = rect.y;
         w = rect.width;
         h = rect.height;
         y = rect.y;
         w = rect.width;
         h = rect.height;

+
+        return true;

     }
     else
     {
     }
     else
     {


@@ -329,25 +280,20 @@ void wxRegion::GetBox( wxCoord &x, wxCoord &y, wxCoord &w, wxCoord &h ) const
         y = 0;
         w = -1;
         h = -1;
         y = 0;
         w = -1;
         h = -1;

-    }
-}

 
 

-wxRect wxRegion::GetBox() const
-{
-    wxCoord x, y, w, h;
-    GetBox( x, y, w, h );
-    return wxRect( x, y, w, h );
+        return false;
+    }

 }
 
 }
 

-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const

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

-        return TRUE;
+        return true;

 
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
 
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 

-wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
+wxRegionContain wxRegion::DoContainsPoint( wxCoord x, wxCoord y ) const

 {
     if (!m_refData)
         return wxOutRegion;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -358,16 +304,16 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
         return wxOutRegion;
 }
 
         return wxOutRegion;
 }
 

-wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& r) const

 {
     if (!m_refData)
         return wxOutRegion;
 
     GdkRectangle rect;
 {
     if (!m_refData)
         return wxOutRegion;
 
     GdkRectangle rect;

-    rect.x = x;
-    rect.y = y;
-    rect.width = w;
-    rect.height = h;
+    rect.x = r.x;
+    rect.y = r.y;
+    rect.width = r.width;
+    rect.height = r.height;

     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {
     GdkOverlapType res = gdk_region_rect_in( M_REGIONDATA->m_region, &rect );
     switch (res)
     {


@@ -378,16 +324,6 @@ wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     return wxOutRegion;
 }
 
     return wxOutRegion;
 }
 

-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
-    return Contains( pt.x, pt.y );
-}
-
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
-{
-    return Contains( rect.x, rect.y, rect.width, rect.height );
-}
-

 GdkRegion *wxRegion::GetRegion() const
 {
     if (!m_refData)
 GdkRegion *wxRegion::GetRegion() const
 {
     if (!m_refData)