Add wxAnyScrollHelperBase to reduce code duplication in wxVarScrollHelperBase.

[wxWidgets.git] / src / generic / mask.cpp

diff --git a/src/generic/mask.cpp b/src/generic/mask.cpp
index aec9a245c08b1dc579fcf150330dab4c1f350ceb..504a4628553ae1e8abdfb7f22ff45b02e8597ec9 100644 (file)
--- a/src/generic/mask.cpp
+++ b/src/generic/mask.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic wxMask implementation
 // Author:      Vadim Zeitlin
 // Created:     2006-09-28
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -49,12 +48,12 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
     wxImage imgSrc(bitmap.ConvertToImage());
     imgSrc.SetMask(false);
     wxImage image(imgSrc.ConvertToMono(clr.Red(), clr.Green(), clr.Blue()));
-    if ( !image.Ok() )
+    if ( !image.IsOk() )
         return false;
 
     m_bitmap = wxBitmap(image, 1);
 
-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();
 #else // !wxUSE_IMAGE
     wxUnusedVar(bitmap);
     wxUnusedVar(colour);
@@ -65,7 +64,7 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
 
 bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
 {
-    wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap") );
+    wxCHECK_MSG( bitmap.IsOk(), false, wxT("Invalid bitmap") );
     wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
 
     m_bitmap = bitmap;