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

Fix wxIcon wxDVC columns under wxGTK

Browse Source 
b376d1402b accidentally broke columns
with wxIcon type. Contrary to that commit's assumption, operator<<
cannot convert wxIcon to wxBitmap and asserts:

src/common/bmpbase.cpp(33): assert "variant.GetType() == "wxBitmap"" failed in operator<<().

Fixed by restoring explicit conversion.
This commit is contained in:
Václav Slavík 2021-06-07 16:15:53 +02:00 committed by paulcor
parent 7ca4705bd7
commit c817a434d8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/dataview.cpp
View File

@ -2562,8 +2562,16 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value ) bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
{ {
wxBitmap bitmap; wxBitmap bitmap;
if (value.GetType() == wxS("wxBitmap") || value.GetType() == wxS("wxIcon")) if (value.GetType() == wxS("wxBitmap"))
{
bitmap << value; bitmap << value;
}
else if (value.GetType() == wxS("wxIcon"))
{
wxIcon icon;
icon << value;
bitmap.CopyFromIcon(icon);
}
#ifdef __WXGTK3__ #ifdef __WXGTK3__
WX_CELL_RENDERER_PIXBUF(m_renderer)->Set(bitmap); WX_CELL_RENDERER_PIXBUF(m_renderer)->Set(bitmap);