fixed wxDFB compilation after wxDC-related changes

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

diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index bd6e379973089d7e20ca0aed114a6e79eb5e5214..f4bc68dcf98081a8c7358a58f0b8884bc1fcfbc4 100644 (file)
--- a/src/dfb/region.cpp
+++ b/src/dfb/region.cpp
@@ -80,42 +80,30 @@ wxRegion::~wxRegion()
     // m_refData unrefed in ~wxObject
 }
 
-bool wxRegion::operator==(const wxRegion& region) const
-{
-    if ( m_refData == region.m_refData )
-        return true;
-
-    if ( !Ok() )
-    {
-        // only equal if both are invalid, otherwise different
-        return !region.Ok();
-    }
-
-    return M_REGION->m_rect == M_REGION_OF(region)->m_rect;
-}
-
 //-----------------------------------------------------------------------------
 // Information about the region
 //-----------------------------------------------------------------------------
 
-void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
+bool wxRegion::DoIsEqual(const wxRegion& region) const
 {
-    wxRect r = GetBox();
+    return M_REGION->m_rect == M_REGION_OF(region)->m_rect;
+}
+
+bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
+{
+    if ( !m_refData )
+        return false;
+
+    const wxRect& r = M_REGION->m_rect;
     x = r.GetX();
     y = r.GetY();
     w = r.GetWidth();
     h = r.GetHeight();
-}
 
-wxRect wxRegion::GetBox() const
-{
-    if (m_refData)
-        return M_REGION->m_rect;
-    else
-        return wxRect();
+    return true;
 }
 
-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const
 {
     if (!m_refData)
         return true;
@@ -132,57 +120,56 @@ void wxRegion::Clear()
     UnRef();
 }
 
-bool wxRegion::Offset(wxCoord x, wxCoord y)
+bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {
     AllocExclusive();
     M_REGION->m_rect.Offset(x, y);
     return true;
 }
 
-bool wxRegion::Union(const wxRect& rect)
+bool wxRegion::DoUnionWithRect(const wxRect& rect)
 {
     AllocExclusive();
 
-    if ( M_REGION->m_rect.Inside(rect) )
+    if ( M_REGION->m_rect.Contains(rect) )
     {
         return true;
     }
-    else if ( rect.Inside(M_REGION->m_rect) )
+    else if ( rect.Contains(M_REGION->m_rect) )
     {
         M_REGION->m_rect = rect;
         return true;
     }
     else
     {
-        wxFAIL_MSG( _T("only rectangular regions are supported") );
+        wxFAIL_MSG( "only rectangular regions are supported" );
         return false;
     }
 }
 
-bool wxRegion::Union(const wxRegion& region)
+bool wxRegion::DoUnionWithRegion(const wxRegion& region)
 {
-    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
-    return Union(M_REGION_OF(region)->m_rect);
+    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    return DoUnionWithRect(M_REGION_OF(region)->m_rect);
 }
 
-bool wxRegion::Intersect(const wxRect& rect)
+bool wxRegion::DoIntersect(const wxRegion& region)
 {
+    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+
     AllocExclusive();
-    M_REGION->m_rect.Intersect(rect);
+    M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect);
     return true;
 }
 
-bool wxRegion::Intersect(const wxRegion& region)
+bool wxRegion::DoSubtract(const wxRegion& region)
 {
-    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
-    return Intersect(M_REGION_OF(region)->m_rect);
-}
+    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    wxCHECK_MSG( Ok(), false, "invalid region" );
 
-bool wxRegion::Subtract(const wxRect& rect)
-{
-    wxCHECK_MSG( Ok(), false, _T("invalid region") );
+    const wxRect& rect = M_REGION_OF(region)->m_rect;
 
-    if ( rect.Inside(M_REGION->m_rect) )
+    if ( rect.Contains(M_REGION->m_rect) )
     {
         // subtracted rectangle contains this one, so the result is empty
         // rectangle
@@ -196,50 +183,39 @@ bool wxRegion::Subtract(const wxRect& rect)
     }
     else
     {
-        wxFAIL_MSG( _T("only rectangular regions implemented") );
+        wxFAIL_MSG( "only rectangular regions implemented" );
         return false;
     }
 }
 
-bool wxRegion::Subtract(const wxRegion& region)
-{
-    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
-    return Subtract(M_REGION_OF(region)->m_rect);
-}
-
-bool wxRegion::Xor(const wxRect& rect)
+bool wxRegion::DoXor(const wxRegion& region)
 {
-    wxFAIL_MSG( _T("Xor not implemented") );
+    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    wxFAIL_MSG( "Xor not implemented" );
     return false;
 }
 
-bool wxRegion::Xor(const wxRegion& region)
-{
-    wxCHECK_MSG( region.Ok(), false, _T("invalid region") );
-    return Xor(M_REGION_OF(region)->m_rect);
-}
-
 
 //-----------------------------------------------------------------------------
 // Tests
 //-----------------------------------------------------------------------------
 
-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
+wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
 {
-    wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") );
+    wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" );
 
-    if (M_REGION->m_rect.Inside(x, y))
+    if (M_REGION->m_rect.Contains(x, y))
         return wxInRegion;
     else
         return wxOutRegion;
 }
 
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
 {
-    wxCHECK_MSG( Ok(), wxOutRegion, _T("invalid region") );
+    wxCHECK_MSG( Ok(), wxOutRegion, "invalid region" );
 
     // 1) is the rectangle entirely covered by the region?
-    if (M_REGION->m_rect.Inside(rect))
+    if (M_REGION->m_rect.Contains(rect))
         return wxInRegion;
 
     // 2) is the rectangle completely outside the region?