Ok tests pixmap and bitmap now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user