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

Renamed TOOL_MOUSE_BUTTONS constants to avoid name conflict with Windows MB_RIGHT constant.

This commit is contained in:
Maciej Suminski 2013-10-15 10:41:00 +02:00
parent 853b32df30
commit 5249b1a6da
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/tool/tool_dispatcher.cpp
View File

@ -89,9 +89,9 @@ struct TOOL_DISPATCHER::BUTTON_STATE
TOOL_DISPATCHER::TOOL_DISPATCHER( TOOL_MANAGER* aToolMgr, PCB_BASE_FRAME* aEditFrame ) :
m_toolMgr( aToolMgr ), m_editFrame( aEditFrame )
{
m_buttons.push_back( new BUTTON_STATE( MB_LEFT, wxEVT_LEFT_DOWN, wxEVT_LEFT_UP ) );
m_buttons.push_back( new BUTTON_STATE( MB_RIGHT, wxEVT_RIGHT_DOWN, wxEVT_RIGHT_UP ) );
m_buttons.push_back( new BUTTON_STATE( MB_MIDDLE, wxEVT_MIDDLE_DOWN, wxEVT_MIDDLE_UP ) );
m_buttons.push_back( new BUTTON_STATE( BUT_LEFT, wxEVT_LEFT_DOWN, wxEVT_LEFT_UP ) );
m_buttons.push_back( new BUTTON_STATE( BUT_RIGHT, wxEVT_RIGHT_DOWN, wxEVT_RIGHT_UP ) );
m_buttons.push_back( new BUTTON_STATE( BUT_MIDDLE, wxEVT_MIDDLE_DOWN, wxEVT_MIDDLE_UP ) );
ResetState();
}

8
common/tool/tool_event.cpp
View File

@ -98,10 +98,10 @@ const std::string TOOL_EVENT::Format() const
const FlagString buttons[] =
{
{ MB_NONE, "none" },
{ MB_LEFT, "left" },
{ MB_RIGHT, "right" },
{ MB_MIDDLE, "middle" },
{ BUT_NONE, "none" },
{ BUT_LEFT, "left" },
{ BUT_RIGHT, "right" },
{ BUT_MIDDLE, "middle" },
{ 0, "" }
};

2
common/tool/tool_manager.cpp
View File

@ -433,7 +433,7 @@ bool TOOL_MANAGER::ProcessEvent( TOOL_EVENT& aEvent )
// or immediately (CMENU_NOW) mode. The latter is used for clarification lists.
if( st->contextMenuTrigger != CMENU_OFF )
{
if( st->contextMenuTrigger == CMENU_BUTTON && !aEvent.IsClick( MB_RIGHT ) )
if( st->contextMenuTrigger == CMENU_BUTTON && !aEvent.IsClick( BUT_RIGHT ) )
break;
st->pendingWait = true;

20
include/tool/tool_event.h
View File

@ -93,12 +93,12 @@ enum TOOL_ACTIONS
enum TOOL_MOUSE_BUTTONS
{
MB_NONE = 0x0,
MB_LEFT = 0x1,
MB_RIGHT = 0x2,
MB_MIDDLE = 0x4,
MB_BUTTON_MASK = MB_LEFT | MB_RIGHT | MB_MIDDLE,
MB_ANY = 0xffffffff
BUT_NONE = 0x0,
BUT_LEFT = 0x1,
BUT_RIGHT = 0x2,
BUT_MIDDLE = 0x4,
BUT_BUTTON_MASK = BUT_LEFT | BUT_RIGHT | BUT_MIDDLE,
BUT_ANY = 0xffffffff
};
enum TOOL_MODIFIERS
@ -158,7 +158,7 @@ public:
{
if( aCategory == TC_MOUSE )
{
m_mouseButtons = aExtraParam & MB_BUTTON_MASK;
m_mouseButtons = aExtraParam & BUT_BUTTON_MASK;
}
else if( aCategory == TC_KEYBOARD )
{
@ -227,18 +227,18 @@ public:
return m_mouseButtons;
}
bool IsClick( int aButtonMask = MB_ANY ) const
bool IsClick( int aButtonMask = BUT_ANY ) const
{
return ( m_actions == TA_MOUSE_CLICK )
&& ( ( m_mouseButtons & aButtonMask ) == aButtonMask );
}
bool IsDrag( int aButtonMask = MB_ANY ) const
bool IsDrag( int aButtonMask = BUT_ANY ) const
{
return ( m_actions == TA_MOUSE_DRAG ) && ( ( m_mouseButtons & aButtonMask ) == aButtonMask );
}
bool IsMouseUp( int aButtonMask = MB_ANY ) const
bool IsMouseUp( int aButtonMask = BUT_ANY ) const
{
return ( m_actions == TA_MOUSE_UP ) && ( ( m_mouseButtons & aButtonMask ) == aButtonMask );
}

8
include/tool/tool_interactive.h
View File

@ -111,10 +111,10 @@ protected:
const TOOL_EVENT evCommand( int aCommandId = -1 );
const TOOL_EVENT evCommand( std::string aCommandStr = "" );
const TOOL_EVENT evMotion();
const TOOL_EVENT evClick( int aButton = MB_ANY );
const TOOL_EVENT evDrag( int aButton = MB_ANY );
const TOOL_EVENT evButtonUp( int aButton = MB_ANY );
const TOOL_EVENT evButtonDown(int aButton = MB_ANY );
const TOOL_EVENT evClick( int aButton = BUT_ANY );
const TOOL_EVENT evDrag( int aButton = BUT_ANY );
const TOOL_EVENT evButtonUp( int aButton = BUT_ANY );
const TOOL_EVENT evButtonDown(int aButton = BUT_ANY );
private:
void goInternal( TOOL_STATE_FUNC& aState, const TOOL_EVENT_LIST& aConditions );

4
pcbnew/router/router_tool.cpp
View File

@ -323,7 +323,7 @@ void ROUTER_TOOL::startRouting()
updateEndItem( *evt );
m_router->Move( m_endSnapPoint, m_endItem );
}
else if( evt->IsClick( MB_LEFT ) )
else if( evt->IsClick( BUT_LEFT ) )
{
updateEndItem( *evt );
@ -396,7 +396,7 @@ int ROUTER_TOOL::Main( TOOL_EVENT& aEvent )
break; // Finish
else if( evt->IsMotion() )
updateStartItem( *evt );
else if( evt->IsClick( MB_LEFT ) )
else if( evt->IsClick( BUT_LEFT ) )
{
updateStartItem( *evt );
startRouting();

4
pcbnew/tools/move_tool.cpp
View File

@ -118,7 +118,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
}
}
else if( evt->IsMotion() || evt->IsDrag( MB_LEFT ) )
else if( evt->IsMotion() || evt->IsDrag( BUT_LEFT ) )
{
if( dragging )
{
@ -143,7 +143,7 @@ int MOVE_TOOL::Main( TOOL_EVENT& aEvent )
selection.group->ViewUpdate( VIEW_ITEM::GEOMETRY );
dragPosition = evt->Position();
}
else if( evt->IsMouseUp( MB_LEFT ) || evt->IsClick( MB_LEFT ) )
else if( evt->IsMouseUp( BUT_LEFT ) || evt->IsClick( BUT_LEFT ) )
break; // Finish
}

8
pcbnew/tools/selection_tool.cpp
View File

@ -103,11 +103,11 @@ int SELECTION_TOOL::Main( TOOL_EVENT& aEvent )
}
// single click? Select single object
if( evt->IsClick( MB_LEFT ) )
if( evt->IsClick( BUT_LEFT ) )
selectSingle( evt->Position() );
// drag with LMB? Select multiple objects (or at least draw a selection box) or drag them
if( evt->IsDrag( MB_LEFT ) )
if( evt->IsDrag( BUT_LEFT ) )
{
if( m_selection.Empty() || m_additive )
{
@ -299,7 +299,7 @@ bool SELECTION_TOOL::selectMultiple()
break;
}
if( evt->IsDrag( MB_LEFT ) )
if( evt->IsDrag( BUT_LEFT ) )
{
if( !m_additive )
clearSelection();
@ -311,7 +311,7 @@ bool SELECTION_TOOL::selectMultiple()
m_selArea->ViewUpdate( VIEW_ITEM::GEOMETRY );
}
if( evt->IsMouseUp( MB_LEFT ) )
if( evt->IsMouseUp( BUT_LEFT ) )
{
// End drawing the selection box
m_selArea->ViewSetVisible( false );