Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / x11 / dataobj.cpp

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 88de745710223a6f2f4d7b4e7a3799d651ad23bd..01e5cd9ed02d66f16ac9292ca0a39e6e9bc31fbf 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -349,7 +349,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 
     m_bitmap = image;
 
-    return m_bitmap.Ok();
+    return m_bitmap.IsOk();
 #else
     return false;
 #endif
@@ -358,7 +358,7 @@ bool wxBitmapDataObject::SetData(size_t size, const void *buf)
 void wxBitmapDataObject::DoConvertToPng()
 {
 #if wxUSE_LIBPNG
-    if (!m_bitmap.Ok())
+    if (!m_bitmap.IsOk())
         return;
 
     wxImage image = m_bitmap.ConvertToImage();