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

Fix a compil warning and a wxASSERT in netlist dialog and component_tree.cpp

This commit is contained in:
jean-pierre charras 2017-07-08 14:22:20 +02:00
parent 885a4c1bc5
commit 895c0bb716
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eeschema/block_libedit.cpp
View File

@ -207,6 +207,7 @@ bool LIB_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
case BLOCK_DUPLICATE_AND_INCREMENT: // not used in Eeschema case BLOCK_DUPLICATE_AND_INCREMENT: // not used in Eeschema
case BLOCK_MOVE_EXACT: // not used in Eeschema case BLOCK_MOVE_EXACT: // not used in Eeschema
case BLOCK_CUT: // not used in libedit
break; break;
} }

6
eeschema/dialogs/dialog_netlist.cpp
View File

@ -449,11 +449,11 @@ NETLIST_PAGE_DIALOG* NETLIST_DIALOG::AddOneCustomPage( const wxString & aTitle,
currPage->m_CommandStringCtrl->SetInsertionPoint( 1 ); currPage->m_CommandStringCtrl->SetInsertionPoint( 1 );
currPage->m_LowBoxSizer->Add( currPage->m_CommandStringCtrl, currPage->m_LowBoxSizer->Add( currPage->m_CommandStringCtrl,
0, 0,
wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, wxGROW | wxTOP | wxLEFT | wxRIGHT | wxBOTTOM,
5 ); 5 );
currPage->m_LowBoxSizer->Add( new wxStaticText( currPage, currPage->m_LowBoxSizer->Add( new wxStaticText( currPage,
-1, _( "Title:" ) ), 0, -1, _( "Title:" ) ), 0,
wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 ); wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
currPage->m_TitleStringCtrl = new wxTextCtrl( currPage, -1, aTitle, currPage->m_TitleStringCtrl = new wxTextCtrl( currPage, -1, aTitle,
@ -462,7 +462,7 @@ NETLIST_PAGE_DIALOG* NETLIST_DIALOG::AddOneCustomPage( const wxString & aTitle,
currPage->m_TitleStringCtrl->SetInsertionPoint( 1 ); currPage->m_TitleStringCtrl->SetInsertionPoint( 1 );
currPage->m_LowBoxSizer->Add( currPage->m_TitleStringCtrl, currPage->m_LowBoxSizer->Add( currPage->m_TitleStringCtrl,
0, 0,
wxGROW | wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT | wxBOTTOM, wxGROW | wxTOP | wxLEFT | wxRIGHT | wxBOTTOM,
5 ); 5 );
return currPage; return currPage;
} }

4
eeschema/libarch.cpp
View File

@ -66,11 +66,11 @@ bool SCH_EDIT_FRAME::CreateArchiveLibrary( const wxString& aFileName )
PART_LIB* cacheLib = new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName ); PART_LIB* cacheLib = new PART_LIB( LIBRARY_TYPE_EESCHEMA, aFileName );
cacheLib->SetCache(); cacheLib->SetCache();
cacheLib->EnableBuffering(); cacheLib->EnableBuffering(); // To save symbols to file only when the library will be fully built
/* Examine all screens (not hierarchical sheets) used in the schematic and build a /* Examine all screens (not hierarchical sheets) used in the schematic and build a
* library of unique symbols found in all screens. Complex hierarchies are not a * library of unique symbols found in all screens. Complex hierarchies are not a
* problem because we just want to know the library symbols used in the schematic. * problem because we just want to know the library symbols used in the schematic, not their reference.
*/ */
for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() ) for( SCH_SCREEN* screen = screens.GetFirst(); screen; screen = screens.GetNext() )
{ {

2
eeschema/widgets/component_tree.cpp
View File

@ -53,7 +53,7 @@ COMPONENT_TREE::COMPONENT_TREE( wxWindow* aParent,
0, wxALIGN_CENTER | wxALL, 5 ); 0, wxALIGN_CENTER | wxALL, 5 );
#endif #endif
search_sizer->Add( m_query_ctrl, 1, wxALIGN_CENTER | wxALL | wxEXPAND, 5 ); search_sizer->Add( m_query_ctrl, 1, wxALL | wxEXPAND, 5 );
sizer->Add( search_sizer, 0, wxEXPAND, 5 ); sizer->Add( search_sizer, 0, wxEXPAND, 5 );
m_query_ctrl->Bind( wxEVT_TEXT, &COMPONENT_TREE::onQueryText, this ); m_query_ctrl->Bind( wxEVT_TEXT, &COMPONENT_TREE::onQueryText, this );