Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing handling of mouse-down buttons according to patch 1749825

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-07-22 14:54:01 +00:00
parent d79f943ad0
commit 429a5b011e
1 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/mac/carbon/toplevel.cpp
View File

@@ -255,11 +255,15 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
UInt32 modifiers = cEvent.GetParameter<UInt32>(kEventParamKeyModifiers, typeUInt32) ;
Point screenMouseLocation = cEvent.GetParameter<Point>(kEventParamMouseLocation) ;
// this parameter are not given for all events
// these parameters are not given for all events
EventMouseButton button = 0 ;
UInt32 clickCount = 0 ;
UInt32 mouseChord = 0;
cEvent.GetParameter<EventMouseButton>( kEventParamMouseButton, typeMouseButton , &button ) ;
cEvent.GetParameter<UInt32>( kEventParamClickCount, typeUInt32 , &clickCount ) ;
// the chord is the state of the buttons pressed currently
cEvent.GetParameter<UInt32>( kEventParamMouseChord, typeUInt32 , &mouseChord ) ;
wxevent.m_x = screenMouseLocation.h;
wxevent.m_y = screenMouseLocation.v;
@@ -298,29 +302,20 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
button = g_lastButton ;
// determine the correct down state, wx does not want a 'down' for a mouseUp event,
// while mac delivers this button
if ( button != 0 && cEvent.GetKind() != kEventMouseUp )
{
switch ( button )
{
case kEventMouseButtonPrimary :
wxevent.m_leftDown = true ;
break ;
case kEventMouseButtonSecondary :
wxevent.m_rightDown = true ;
break ;
case kEventMouseButtonTertiary :
wxevent.m_middleDown = true ;
break ;
default:
break ;
}
}
// Adjust the chord mask to remove the primary button and add the
// secondary button. It is possible that the secondary button is
// already pressed, e.g. on a mouse connected to a laptop, but this
// possibility is ignored here:
if( thisButtonIsFakeRight && ( mouseChord & 1U ) )
mouseChord = ((mouseChord & ~1U) | 2U);
if(mouseChord & 1U)
wxevent.m_leftDown = true ;
if(mouseChord & 2U)
wxevent.m_rightDown = true ;
if(mouseChord & 4U)
wxevent.m_middleDown = true ;
// translate into wx types
switch ( cEvent.GetKind() )
{
@@ -364,21 +359,25 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
}
break ;
case kEventMouseWheelMoved :
{
wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
case kEventMouseWheelMoved :
{
wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
// EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeSInt32) ;
// EventMouseWheelAxis axis = cEvent.GetParameter<EventMouseWheelAxis>(kEventParamMouseWheelAxis, typeMouseWheelAxis) ;
SInt32 delta = cEvent.GetParameter<SInt32>(kEventParamMouseWheelDelta, typeSInt32) ;
wxevent.m_wheelRotation = delta;
wxevent.m_wheelDelta = 1;
wxevent.m_linesPerAction = 1;
}
break ;
default :
wxevent.m_wheelRotation = delta;
wxevent.m_wheelDelta = 1;
wxevent.m_linesPerAction = 1;
}
break ;
case kEventMouseEntered :
case kEventMouseExited :
case kEventMouseDragged :
case kEventMouseMoved :
wxevent.SetEventType( wxEVT_MOTION ) ;
break;
default :
break ;
}
}