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

Pcbnew: fix Bug #927293. fix compil issue with wxWidgets 2.9.3

This commit is contained in:
jean-pierre charras 2012-02-06 10:10:32 +01:00
parent 398607a658
commit 3da1b75c67
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcbnew/dialogs/dialog_copper_zones.cpp
View File

@ -19,6 +19,7 @@
#include <class_zone_settings.h>
#include <class_board.h>
#include <dialog_copper_zones_base.h>
#include <wx/listctrl.h>

14
pcbnew/netlist_reader_common.cpp
View File

@ -189,8 +189,19 @@ void NETLIST_READER::TestFootprintsMatchingAndExchange()
{
#ifdef PCBNEW
for( MODULE* module = m_pcbframe->GetBoard()->m_Modules; module; module = module->Next() )
// If a module is "exchanged", the new module is added to the end of
// module list.
// Calculates the module count
int moduleCount = m_pcbframe->GetBoard()->m_Modules.GetCount();
MODULE* nextmodule;
MODULE *module = m_pcbframe->GetBoard()->m_Modules;
for( ; module && moduleCount; module = nextmodule, moduleCount-- )
{
// Module can be deleted if exchanged, so store the next module.
nextmodule = module->Next();
// Search for the corresponding module info
COMPONENT_INFO * cmp_info = NULL;
for( unsigned ii = 0; ii < m_componentsInNetlist.size(); ii++ )
@ -218,7 +229,6 @@ void NETLIST_READER::TestFootprintsMatchingAndExchange()
{
// Change old module to the new module (and delete the old one)
m_pcbframe->Exchange_Module( module, newModule, NULL );
module = newModule;
}
else if( m_messageWindow )
{