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

Suppress wx3.1.6 assert because it wants the window handle for dpi 

(cherry picked from commit ccf235a8c3)
This commit is contained in:
Marek Roszko 2022-05-08 19:25:29 -04:00 committed by Mark Roszko
parent 09a2d50e09
commit d45ce2f659
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/tool/action_toolbar.cpp
View File

@ -335,7 +335,12 @@ void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aA
// Update the item information // Update the item information
item->SetShortHelp( aAction.GetDescription() ); item->SetShortHelp( aAction.GetDescription() );
item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) ); item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
#if wxCHECK_VERSION( 3, 1, 6 )
item->SetDisabledBitmap(
MakeDisabledBitmap( item->GetBitmapBundle().GetBitmapFor( GetParent() ) ) );
#else
item->SetDisabledBitmap( MakeDisabledBitmap( item->GetBitmap() ) ); item->SetDisabledBitmap( MakeDisabledBitmap( item->GetBitmap() ) );
#endif
// Register a new handler with the new UI conditions // Register a new handler with the new UI conditions
if( m_toolManager ) if( m_toolManager )