Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reset wxStaticBitmap image when passed empty bitmap in wxGTK

Browse Source 
This makes the behaviour consistent with the other ports.

Closes #17420.
This commit is contained in:
Kolya Kosenko
2016-03-04 14:47:32 +01:00
committed by Vadim Zeitlin
parent 5d9c578df3
commit 59b29a3a71
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/statbmp.cpp
View File

@@ -59,15 +59,15 @@ void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{ {
m_bitmap = bitmap; m_bitmap = bitmap;
// always use pixbuf, because pixmap mask does not
// work with disabled images in some themes
if (m_bitmap.IsOk()) if (m_bitmap.IsOk())
{
// always use pixbuf, because pixmap mask does not
// work with disabled images in some themes
gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), m_bitmap.GetPixbuf()); gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), m_bitmap.GetPixbuf());
else
gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget), NULL);
InvalidateBestSize(); InvalidateBestSize();
SetSize(GetBestSize()); SetSize(GetBestSize());
}
} }
// static // static