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

Fix a collision name in drawing_tool.h with a msys2 header

This commit is contained in:
jean-pierre charras 2020-06-21 10:36:01 +02:00
parent 65550e6a6e
commit ad69e449fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/tools/drawing_tool.cpp
View File

@ -191,7 +191,7 @@ int DRAWING_TOOL::DrawRectangle( const TOOL_EVENT& aEvent )
MODULE* module = dynamic_cast<MODULE*>( m_frame->GetModel() ); MODULE* module = dynamic_cast<MODULE*>( m_frame->GetModel() );
DRAWSEGMENT* rect = m_editModules ? new EDGE_MODULE( module ) : new DRAWSEGMENT; DRAWSEGMENT* rect = m_editModules ? new EDGE_MODULE( module ) : new DRAWSEGMENT;
BOARD_COMMIT commit( m_frame ); BOARD_COMMIT commit( m_frame );
SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::RECT ); SCOPED_DRAW_MODE scopedDrawMode( m_mode, MODE::RECTANGLE );
OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) ); OPT<VECTOR2D> startingPoint = boost::make_optional<VECTOR2D>( false, VECTOR2D( 0, 0 ) );
rect->SetFlags(IS_NEW ); rect->SetFlags(IS_NEW );

2
pcbnew/tools/drawing_tool.h
View File

@ -64,7 +64,7 @@ public:
{ {
NONE, NONE,
LINE, LINE,
RECT, RECTANGLE,
CIRCLE, CIRCLE,
ARC, ARC,
TEXT, TEXT,