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

pcbnew.py: fix error "NameError: name 'UNDEFINED_LAYER' is not defined" when running pcbnew/wxPython, which prevents from openning the Python console. 

CMakeLists.txt: remove no more used boost libs, and add missing coroutine lib in list.
Fix 2 minor compil warnings.
This commit is contained in:
jean-pierre charras 2016-01-11 09:26:55 +01:00
parent 020ba521df
commit 41db57c5f0
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -460,8 +460,7 @@ find_package( Cairo 1.8.8 REQUIRED )
# #
# Note: Prior to Boost 1.59, the Boost context library is not built when compiling on windows # Note: Prior to Boost 1.59, the Boost context library is not built when compiling on windows
# with GCC. You must patch the Boost sources. # with GCC. You must patch the Boost sources.
find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale find_package( Boost 1.54.0 REQUIRED COMPONENTS context coroutine system thread )
program_options regex system thread )
# Include MinGW resource compiler. # Include MinGW resource compiler.
include( MinGWResourceCompiler ) include( MinGWResourceCompiler )

3
common/dialogs/dialog_hotkeys_editor.cpp
View File

@ -60,7 +60,7 @@ HOTKEY_LIST_CTRL::HOTKEY_LIST_CTRL( wxWindow *aParent, const HOTKEYS_SECTIONS& a
void HOTKEY_LIST_CTRL::DeselectRow( int aRow ) void HOTKEY_LIST_CTRL::DeselectRow( int aRow )
{ {
wxASSERT( aRow >= 0 && aRow < m_items.size() ); wxASSERT( aRow >= 0 && aRow < (int)m_items.size() );
Unselect( m_items[aRow] ); Unselect( m_items[aRow] );
} }
@ -112,7 +112,6 @@ void HOTKEY_LIST_CTRL::OnChar( wxKeyEvent& aEvent )
if( exists && data->GetHotkey().m_KeyCode != key ) if( exists && data->GetHotkey().m_KeyCode != key )
{ {
wxString tag = data->GetSectionTag(); wxString tag = data->GetSectionTag();
HOTKEYS_EDITOR_DIALOG* parent = static_cast<HOTKEYS_EDITOR_DIALOG*>( m_parent );
bool canUpdate = ResolveKeyConflicts( key, tag ); bool canUpdate = ResolveKeyConflicts( key, tag );
if( canUpdate ) if( canUpdate )

2
pcbnew/class_board.h
View File

@ -1219,7 +1219,7 @@ public:
* @param aLayer The layer to search. Use -1 for a don't care. * @param aLayer The layer to search. Use -1 for a don't care.
* @return VIA* A point a to the VIA object if found, else NULL. * @return VIA* A point a to the VIA object if found, else NULL.
*/ */
VIA* GetViaByPosition( const wxPoint& aPosition, LAYER_ID aLayer = UNDEFINED_LAYER ) const; VIA* GetViaByPosition( const wxPoint& aPosition, LAYER_ID aLayer = LAYER_ID::UNDEFINED_LAYER ) const;
/** /**
* Function GetPad * Function GetPad