Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index f49cf3c88bde02fa86b538e29758371514854bcd..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


@@ -149,13 +149,13 @@ bool wxRegion::DoUnionWithRect(const wxRect& rect)
 
 bool wxRegion::DoUnionWithRegion(const wxRegion& region)
 {
 
 bool wxRegion::DoUnionWithRegion(const wxRegion& region)
 {

-    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "invalid region" );

     return DoUnionWithRect(M_REGION_OF(region)->m_rect);
 }
 
 bool wxRegion::DoIntersect(const wxRegion& region)
 {
     return DoUnionWithRect(M_REGION_OF(region)->m_rect);
 }
 
 bool wxRegion::DoIntersect(const wxRegion& region)
 {

-    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "invalid region" );

 
     AllocExclusive();
     M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect);
 
     AllocExclusive();
     M_REGION->m_rect.Intersect(M_REGION_OF(region)->m_rect);


@@ -164,8 +164,8 @@ bool wxRegion::DoIntersect(const wxRegion& region)
 
 bool wxRegion::DoSubtract(const wxRegion& region)
 {
 
 bool wxRegion::DoSubtract(const wxRegion& region)
 {

-    wxCHECK_MSG( region.Ok(), false, "invalid region" );
-    wxCHECK_MSG( Ok(), false, "invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "invalid region" );
+    wxCHECK_MSG( IsOk(), false, "invalid region" );

 
     const wxRect& rect = M_REGION_OF(region)->m_rect;
 
 
     const wxRect& rect = M_REGION_OF(region)->m_rect;
 


@@ -190,7 +190,7 @@ bool wxRegion::DoSubtract(const wxRegion& region)
 
 bool wxRegion::DoXor(const wxRegion& region)
 {
 
 bool wxRegion::DoXor(const wxRegion& region)
 {

-    wxCHECK_MSG( region.Ok(), false, "invalid region" );
+    wxCHECK_MSG( region.IsOk(), false, "invalid region" );

     wxFAIL_MSG( "Xor not implemented" );
     return false;
 }
     wxFAIL_MSG( "Xor not implemented" );
     return false;
 }


@@ -202,7 +202,7 @@ bool wxRegion::DoXor(const wxRegion& region)
 
 wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
 {
 
 wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
 {

-    wxCHECK_MSG( Ok(), wxOutRegion, "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;


@@ -212,7 +212,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const
 
 wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
 {
 
 wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const
 {

-    wxCHECK_MSG( Ok(), wxOutRegion, "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))