haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't set bitmaps on non-normal menu items under wxGTK 

Fixes: lp:1829780
* https://bugs.launchpad.net/kicad/+bug/1829780
This commit is contained in:
Jon Evans 2019-05-20 20:09:27 -04:00
parent 1401d8a8ea
commit 95a6fb6ea3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tool/conditional_menu.cpp
View File

@ -82,9 +82,13 @@ void CONDITIONAL_MENU::AddCheckItem( int aId, const wxString& aText, const wxStr
{ {
wxMenuItem* item = new wxMenuItem( nullptr, aId, aText, aTooltip, wxITEM_CHECK ); wxMenuItem* item = new wxMenuItem( nullptr, aId, aText, aTooltip, wxITEM_CHECK );
#if !defined(__WXGTK__) // wxGTK does not support bitmaps on checkable menu items
if( aIcon ) if( aIcon )
item->SetBitmap( KiBitmap( aIcon ) ); item->SetBitmap( KiBitmap( aIcon ) );
#endif
addEntry( ENTRY( item, aCondition, aOrder, true ) ); addEntry( ENTRY( item, aCondition, aOrder, true ) );
} }