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

Fixed disambiguation menu issue.

This commit is contained in:
Maciej Suminski 2013-08-08 14:50:32 +02:00
parent 402f3c6f2c
commit 282995eaee
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/tool/context_menu.cpp
View File

@ -37,7 +37,7 @@ public:
CMEventHandler( CONTEXT_MENU* aMenu ):
m_menu(aMenu) {};
void onEvent( wxEvent & aEvent )
void onEvent( wxEvent& aEvent )
{
TOOL_EVENT evt;
wxEventType type = aEvent.GetEventType();

2
common/tool/tool_interactive.cpp
View File

@ -61,7 +61,7 @@ void TOOL_INTERACTIVE::Reset()
}
void TOOL_INTERACTIVE::SetContextMenu( CONTEXT_MENU *aMenu, TOOL_ContextMenuTrigger aTrigger )
void TOOL_INTERACTIVE::SetContextMenu( CONTEXT_MENU* aMenu, TOOL_ContextMenuTrigger aTrigger )
{
aMenu->setTool( this );
m_toolMgr->ScheduleContextMenu( this, aMenu, aTrigger );

2
common/tool/tool_manager.cpp
View File

@ -68,7 +68,7 @@ TOOL_MANAGER::TOOL_MANAGER()
{
}
void TOOL_MANAGER::RegisterTool ( TOOL_BASE *aTool )
void TOOL_MANAGER::RegisterTool( TOOL_BASE* aTool )
{
ToolState* st = new ToolState;

1
include/tool/context_menu.h
View File

@ -40,7 +40,6 @@ class CONTEXT_MENU
{
public:
CONTEXT_MENU();
~CONTEXT_MENU();

2
include/tool/tool_manager.h
View File

@ -156,7 +156,7 @@ class TOOL_MANAGER
TOOL_ContextMenuTrigger aTrigger );
private:
void dispatchInternal ( TOOL_EVENT& aEvent );
void dispatchInternal( TOOL_EVENT& aEvent );
struct ToolState;
typedef std::pair<TOOL_EVENT_LIST, TOOL_STATE_FUNC> Transition;

8
pcbnew/tools/selection_tool.cpp
View File

@ -216,11 +216,11 @@ void SELECTION_TOOL::selectMultiple()
BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR *aCollector )
{
CONTEXT_MENU cmenu;
OPT_TOOL_EVENT evt;
BOARD_ITEM *current = NULL;
cmenu.SetTitle( _( "Clarify selection" ) );
m_menu.reset( new CONTEXT_MENU() );
m_menu->SetTitle( _( "Clarify selection" ) );
int limit = std::min( 10, aCollector->GetCount() );
@ -229,10 +229,10 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR *aCollector )
wxString text;
BOARD_ITEM *item = ( *aCollector )[i];
text = item->GetSelectMenuText();
cmenu.Add( text, i );
m_menu->Add( text, i );
}
SetContextMenu( &cmenu, CMENU_NOW );
SetContextMenu( m_menu.get(), CMENU_NOW );
while( evt = Wait() )
{

2
pcbnew/tools/selection_tool.h
View File

@ -26,6 +26,7 @@
#define __SELECTION_TOOL_H
#include <set>
#include <boost/shared_ptr.hpp>
#include <math/vector2d.h>
#include <tool/tool_interactive.h>
@ -66,6 +67,7 @@ private:
std::set<BOARD_ITEM*> m_selectedItems;
SELECTION_AREA* m_selArea;
boost::shared_ptr<CONTEXT_MENU> m_menu;
};
#endif