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

Fix assertion in new Duplicate Hotkey warning message.

This commit is contained in:
Jeff Young 2019-08-19 14:24:26 +01:00
parent 713a296a59
commit c1cd3339fa
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/widgets/widget_hotkey_list.cpp
View File

@ -599,12 +599,10 @@ void WIDGET_HOTKEY_LIST::initializeElements()
// Add the bitmap image for invalid hotkey warning // Add the bitmap image for invalid hotkey warning
// bitmap size is not know (depending on it is built). So get it: // bitmap size is not know (depending on it is built). So get it:
wxSize iconsize; wxIcon icon;
wxBitmap bm_invalid = KiBitmap( cancel_xpm ); icon.CopyFromBitmap( KiBitmap( cancel_xpm ) );
iconsize.x = bm_invalid.GetWidth(); m_imgList = new wxImageList( icon.GetSize().x, icon.GetSize().y, true, 1 );
iconsize.y = bm_invalid.GetHeight(); m_imgList->Add( icon );
m_imgList = new wxImageList( iconsize.x, iconsize.y, true, 1);
m_imgList->Add( bm_invalid );
AssignImageList( m_imgList ); AssignImageList( m_imgList );
if( !m_readOnly ) if( !m_readOnly )