Minor changes.

This commit is contained in:
Maciej Suminski 2014-07-09 11:59:24 +02:00
parent a6dac245c0
commit 2ee890d74b
4 changed files with 6 additions and 11 deletions

View File

@ -115,7 +115,7 @@ public:
} }
/** /**
* <F11>* Function SetEntry() * Function SetEntry()
* *
* Defines the entry point for the coroutine, if not set in the constructor. * Defines the entry point for the coroutine, if not set in the constructor.
*/ */

View File

@ -419,7 +419,7 @@ protected:
* - Place the current edited library component in Redo list * - Place the current edited library component in Redo list
* - Get old version of the current edited library component * - Get old version of the current edited library component
*/ */
void GetComponentFromUndoList( wxCommandEvent& event ); void GetComponentFromUndoList( wxCommandEvent& aEvent );
/** /**
* Function GetComponentFromRedoList * Function GetComponentFromRedoList
@ -427,7 +427,7 @@ protected:
* - Place the current edited library component in undo list * - Place the current edited library component in undo list
* - Get old version of the current edited library component * - Get old version of the current edited library component
*/ */
void GetComponentFromRedoList( wxCommandEvent& event ); void GetComponentFromRedoList( wxCommandEvent& aEvent );
/** /**
* Function UpdateTitle * Function UpdateTitle

View File

@ -219,9 +219,6 @@ int EDIT_TOOL::Properties( TOOL_EVENT& aEvent )
const SELECTION_TOOL::SELECTION& selection = m_selectionTool->GetSelection(); const SELECTION_TOOL::SELECTION& selection = m_selectionTool->GetSelection();
PCB_EDIT_FRAME* editFrame = getEditFrame<PCB_EDIT_FRAME>(); PCB_EDIT_FRAME* editFrame = getEditFrame<PCB_EDIT_FRAME>();
// Shall the selection be cleared at the end?
bool unselect = selection.Empty();
if( !makeSelection( selection ) ) if( !makeSelection( selection ) )
{ {
setTransitions(); setTransitions();
@ -238,9 +235,11 @@ int EDIT_TOOL::Properties( TOOL_EVENT& aEvent )
// Check if user wants to edit pad or module properties // Check if user wants to edit pad or module properties
if( item->Type() == PCB_MODULE_T ) if( item->Type() == PCB_MODULE_T )
{ {
VECTOR2D cursor = getViewControls()->GetCursorPosition();
for( D_PAD* pad = static_cast<MODULE*>( item )->Pads(); pad; pad = pad->Next() ) for( D_PAD* pad = static_cast<MODULE*>( item )->Pads(); pad; pad = pad->Next() )
{ {
if( pad->ViewBBox().Contains( getViewControls()->GetCursorPosition() ) ) if( pad->ViewBBox().Contains( cursor ) )
{ {
// Turns out that user wants to edit a pad properties // Turns out that user wants to edit a pad properties
item = pad; item = pad;
@ -278,9 +277,6 @@ int EDIT_TOOL::Properties( TOOL_EVENT& aEvent )
item->SetFlags( flags ); item->SetFlags( flags );
} }
if( unselect )
m_selectionTool->ClearSelection();
setTransitions(); setTransitions();
return 0; return 0;

View File

@ -24,7 +24,6 @@
*/ */
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/optional.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <cassert> #include <cassert>