Merge in from trunk r64802 - r68625

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

diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index c93bb6e651e492e5bf72f6a133c426a206e58827..7a2cb28b7d4d820100df5f1186c687211d95d927 100644 (file)
--- a/src/dfb/region.cpp
+++ b/src/dfb/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:      src/mgl/region.cpp
+// Name:      src/dfb/region.cpp

 // Purpose:   Region handling for wxWidgets/DFB
 // Author:    Vaclav Slavik
 // Created:   2006-08-08
 // Purpose:   Region handling for wxWidgets/DFB
 // Author:    Vaclav Slavik
 // Created:   2006-08-08


@@ -45,12 +45,12 @@ public:
 // wxRegion
 //-----------------------------------------------------------------------------
 
 // wxRegion
 //-----------------------------------------------------------------------------
 

-wxObjectRefData *wxRegion::CreateRefData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const

 {
     return new wxRegionRefData;
 }
 
 {
     return new wxRegionRefData;
 }
 

-wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }
 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }


@@ -80,42 +80,30 @@ wxRegion::~wxRegion()
     // m_refData unrefed in ~wxObject
 }
 
     // 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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // 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();
     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;
 {
     if (!m_refData)
         return true;


@@ -132,14 +120,14 @@ void wxRegion::Clear()
     UnRef();
 }
 
     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;
 }
 
 {
     AllocExclusive();
     M_REGION->m_rect.Offset(x, y);
     return true;
 }
 

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

 {
     AllocExclusive();
 
 {
     AllocExclusive();
 


@@ -154,33 +142,32 @@ bool wxRegion::Union(const wxRect& rect)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("only rectangular regions are supported") );
+        wxFAIL_MSG( "only rectangular regions are supported" );

         return false;
     }
 }
 
         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.IsOk(), 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.IsOk(), false, "invalid region" );
+

     AllocExclusive();
     AllocExclusive();

-    M_REGION->m_rect.Intersect(rect);
+    M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect);

     return true;
 }
 
     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.IsOk(), false, "invalid region" );
+    wxCHECK_MSG( IsOk(), 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.Contains(M_REGION->m_rect) )
     {
 
     if ( rect.Contains(M_REGION->m_rect) )
     {


@@ -196,37 +183,26 @@ bool wxRegion::Subtract(const wxRect& rect)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( _T("only rectangular regions implemented") );
+        wxFAIL_MSG( "only rectangular regions implemented" );

         return false;
     }
 }
 
         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.IsOk(), false, "invalid region" );
+    wxFAIL_MSG( "Xor not implemented" );

     return false;
 }
 
     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
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // 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( IsOk(), wxOutRegion, "invalid region" );

 
     if (M_REGION->m_rect.Contains(x, y))
         return wxInRegion;
 
     if (M_REGION->m_rect.Contains(x, y))
         return wxInRegion;


@@ -234,9 +210,9 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
         return wxOutRegion;
 }
 
         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( IsOk(), wxOutRegion, "invalid region" );

 
     // 1) is the rectangle entirely covered by the region?
     if (M_REGION->m_rect.Contains(rect))
 
     // 1) is the rectangle entirely covered by the region?
     if (M_REGION->m_rect.Contains(rect))