Ok tests pixmap and bitmap now

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 38a044b1aa640f50f1cf9e1a439a211a08231de5..e708aaec54f3d57c65c1ab7e86bd122d882b37fc 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -1079,7 +1079,7 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
 
 bool wxBitmap::Ok() const
 {

-    return (m_refData != NULL);
+    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);

 }
 
 int wxBitmap::GetHeight() const
 }
 
 int wxBitmap::GetHeight() const

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 38a044b1aa640f50f1cf9e1a439a211a08231de5..e708aaec54f3d57c65c1ab7e86bd122d882b37fc 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -1079,7 +1079,7 @@ bool wxBitmap::operator != ( const wxBitmap& bmp ) const
 
 bool wxBitmap::Ok() const
 {
 
 bool wxBitmap::Ok() const
 {

-    return (m_refData != NULL);
+    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);

 }
 
 int wxBitmap::GetHeight() const
 }
 
 int wxBitmap::GetHeight() const