From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 21 Feb 2004 14:50:13 +0000 (+0000)
Subject: Ok tests pixmap and bitmap now
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/024e0f69817d09af727310f40e852f92c7513276

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 38a044b1aa..e708aaec54 100644
--- 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
 {
-    return (m_refData != NULL);
+    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
 }
 
 int wxBitmap::GetHeight() const
diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 38a044b1aa..e708aaec54 100644
--- 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
 {
-    return (m_refData != NULL);
+    return (m_refData != NULL) && (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
 }
 
 int wxBitmap::GetHeight() const