Fix wxNullVariant handling in wxDataViewBitmapRenderer

In both the generic and GTK+ implementations, setting the value of a
bitmap column to wxNullVariant resulted in the bitmap, if set for some
rows, being repeated on the rows with null value.
This commit is contained in:
Václav Slavík
2016-10-19 16:46:54 +02:00
parent 065135adcc
commit f3b8dac3b7
2 changed files with 11 additions and 2 deletions

View File

@@ -1141,9 +1141,18 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
{
if (value.GetType() == wxT("wxBitmap"))
{
m_bitmap << value;
if (value.GetType() == wxT("wxIcon"))
}
else if (value.GetType() == wxT("wxIcon"))
{
m_icon << value;
}
else
{
m_icon = wxNullIcon;
m_bitmap = wxNullBitmap;
}
return true;
}