missing commit

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

diff --git a/src/generic/mask.cpp b/src/generic/mask.cpp
index aec9a245c08b1dc579fcf150330dab4c1f350ceb..d5fe5cbff7c0b41fa32639a2fe622b7ae06ac624 100644 (file)
--- a/src/generic/mask.cpp
+++ b/src/generic/mask.cpp
@@ -49,12 +49,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()));
     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 false;
 
     m_bitmap = wxBitmap(image, 1);
 

-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();

 #else // !wxUSE_IMAGE
     wxUnusedVar(bitmap);
     wxUnusedVar(colour);
 #else // !wxUSE_IMAGE
     wxUnusedVar(bitmap);
     wxUnusedVar(colour);


@@ -65,7 +65,7 @@ bool wxMask::InitFromColour(const wxBitmap& bitmap, const wxColour& colour)
 
 bool wxMask::InitFromMonoBitmap(const wxBitmap& bitmap)
 {
 
 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;
     wxCHECK_MSG( bitmap.GetDepth() == 1, false, wxT("Cannot create mask from colour bitmap") );
 
     m_bitmap = bitmap;