X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5001e9361fe01a134b45fa5caf55477e8368d26..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/dfb/region.cpp?ds=sidebyside

diff --git a/src/dfb/region.cpp b/src/dfb/region.cpp
index f4bc68dcf9..d07fd09a5d 100644
--- 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
@@ -33,7 +33,7 @@ public:
 
     ~wxRegionRefData() {}
 
-    // default assignment and comparision operators are OK
+    // default assignment and comparison operators are OK
 
     wxRect m_rect;
 };
@@ -45,12 +45,12 @@ public:
 // wxRegion
 //-----------------------------------------------------------------------------
 
-wxObjectRefData *wxRegion::CreateRefData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const
 {
     return new wxRegionRefData;
 }
 
-wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }
@@ -149,13 +149,13 @@ bool wxRegion::DoUnionWithRect(const wxRect& rect)
 
 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)
 {
-    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);
@@ -164,8 +164,8 @@ bool wxRegion::DoIntersect(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;
 
@@ -178,7 +178,7 @@ bool wxRegion::DoSubtract(const wxRegion& region)
     }
     else if ( !M_REGION->m_rect.Intersects(rect) )
     {
-        // the rectangles are disjoint, so substracting has no effect
+        // the rectangles are disjoint, so subtracting has no effect
         return true;
     }
     else
@@ -190,7 +190,7 @@ bool wxRegion::DoSubtract(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;
 }
@@ -202,7 +202,7 @@ bool wxRegion::DoXor(const wxRegion& region)
 
 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;
@@ -212,7 +212,7 @@ wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) 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))