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

Fix another instance of wxGTK not liking menu icons

This commit is contained in:
Jon Evans 2019-05-20 20:34:08 -04:00
parent 95a6fb6ea3
commit f53c42fac9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/tool/action_menu.cpp
View File

@ -70,6 +70,14 @@ static void set_wxMenuIcon( wxMenuItem* aMenu, const BITMAP_OPAQUE* aIcon )
if( !Pgm().CommonSettings() ) if( !Pgm().CommonSettings() )
return; return;
#if defined(__WXGTK__)
// wxGTK doesn't support this for non-normal menu items
if( aMenu->GetKind() != wxITEM_NORMAL )
return;
#endif
// Retrieve the global applicaton show icon option: // Retrieve the global applicaton show icon option:
bool useImagesInMenus; bool useImagesInMenus;
Pgm().CommonSettings()->Read( USE_ICONS_IN_MENUS_KEY, &useImagesInMenus ); Pgm().CommonSettings()->Read( USE_ICONS_IN_MENUS_KEY, &useImagesInMenus );