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

Fixed a crash in DIALOG_COPPER_ZONE 

wxDataViewCtrl used an incorrect column type, which made wxWidgets try
to extract wxDataViewIcon from an integer variable.

Fixes: lp:1782449
* https://bugs.launchpad.net/kicad/+bug/1782449
This commit is contained in:
Maciej Suminski 2018-07-19 11:09:53 +02:00
parent 829ba27206
commit 887ee46935
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/zone_settings.cpp
View File

@ -165,7 +165,7 @@ void ZONE_SETTINGS::SetupLayersList( wxDataViewListCtrl* aList, PCB_BASE_FRAME*
wxDataViewColumn* checkColumn = aList->AppendToggleColumn( wxEmptyString ); wxDataViewColumn* checkColumn = aList->AppendToggleColumn( wxEmptyString );
wxDataViewColumn* layerColumn = aList->AppendIconTextColumn( wxEmptyString ); wxDataViewColumn* layerColumn = aList->AppendIconTextColumn( wxEmptyString );
wxDataViewColumn* layerIDColumn = aList->AppendIconTextColumn( wxEmptyString ); wxDataViewColumn* layerIDColumn = aList->AppendTextColumn( wxEmptyString );
layerIDColumn->SetHidden( true ); layerIDColumn->SetHidden( true );
int minWidth = 0; int minWidth = 0;
@ -186,7 +186,7 @@ void ZONE_SETTINGS::SetupLayersList( wxDataViewListCtrl* aList, PCB_BASE_FRAME*
wxVector<wxVariant> row; wxVector<wxVariant> row;
row.push_back( wxVariant( m_Layers.test( layerID ) ) ); row.push_back( wxVariant( m_Layers.test( layerID ) ) );
row.push_back( wxVariant( wxDataViewIconText( layerName, icon ) ) ); row.push_back( wxVariant( wxDataViewIconText( layerName, icon ) ) );
row.push_back( wxVariant( layerID ) ); row.push_back( wxVariant( wxString::Format( "%i", layerID ) ) );
aList->AppendItem( row ); aList->AppendItem( row );
if( m_CurrentZone_Layer == layerID ) if( m_CurrentZone_Layer == layerID )