From 024e0f69817d09af727310f40e852f92c7513276 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 21 Feb 2004 14:50:13 +0000 Subject: [PATCH] Ok tests pixmap and bitmap now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/bitmap.cpp | 2 +- src/gtk1/bitmap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.45.2