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

wxGTK: Handle null bitmaps in wxDataViewBitmapRenderer

Browse Source 
Consistently with other implementations, accept wxNullBitmap and
wxNullIcon in wxDataViewBitmapRenderer if the column shouldn't show any
icon.
This commit is contained in:
Václav Slavík
2016-10-08 16:44:30 +02:00
parent f4445caba3
commit ae93a83e76
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/dataview.cpp
View File

@@ -2421,14 +2421,14 @@ bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
// GetPixbuf() may create a Pixbuf representation in the wxBitmap // GetPixbuf() may create a Pixbuf representation in the wxBitmap
// object (and it will stay there and remain owned by wxBitmap) // object (and it will stay there and remain owned by wxBitmap)
SetPixbufProp(m_renderer, bitmap.GetPixbuf()); SetPixbufProp(m_renderer, bitmap.IsOk() ? bitmap.GetPixbuf() : NULL);
} }
else if (value.GetType() == wxT("wxIcon")) else if (value.GetType() == wxT("wxIcon"))
{ {
wxIcon icon; wxIcon icon;
icon << value; icon << value;
SetPixbufProp(m_renderer, icon.GetPixbuf()); SetPixbufProp(m_renderer, icon.IsOk() ? icon.GetPixbuf() : NULL);
} }
else else
{ {