ConvertToImage: Check !Ok() (we may not have any ref data at all) and if

the bitmap is not okay return wxNullImage (instead of a dummy 5x5 image)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index b9575fc890e24319996b91e116fbbf0c32b2bf95..bb7302cf8e9d685a836b8e6275bed365a9279c5c 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -362,8 +362,8 @@ wxBitmap wxBitmap::GetSubBitmap(wxRect const&) const
 
 wxImage wxBitmap::ConvertToImage() const
 {
 
 wxImage wxBitmap::ConvertToImage() const
 {

-    if(!M_BITMAPDATA->m_ok)
-        return wxImage(5,5)/*wxNullImage*/;
+    if(!Ok())
+        return /*wxImage(5,5)*/wxNullImage;

     return wxImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
 }
 
     return wxImage(M_BITMAPDATA->m_width,M_BITMAPDATA->m_height);
 }