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

Patch 1708290

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-05-01 13:35:00 +00:00
parent 09ac36f80b
commit 8736cc485b
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,6 +249,7 @@ static pascal OSStatus KeyboardEventHandler( EventHandlerCallRef handler , Event
wxWindow* g_MacLastWindow = NULL ; wxWindow* g_MacLastWindow = NULL ;
EventMouseButton g_lastButton = 0 ; EventMouseButton g_lastButton = 0 ;
bool g_lastButtonWasFakeRight = false ;
void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent ) void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
{ {
@@ -269,10 +270,13 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
wxevent.m_metaDown = modifiers & cmdKey; wxevent.m_metaDown = modifiers & cmdKey;
wxevent.SetTimestamp( cEvent.GetTicks() ) ; wxevent.SetTimestamp( cEvent.GetTicks() ) ;
// a control click is interpreted as a right click // a control click is interpreted as a right click
bool thisButtonIsFakeRight = false ;
if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) ) if ( button == kEventMouseButtonPrimary && (modifiers & controlKey) )
{
button = kEventMouseButtonSecondary ; button = kEventMouseButtonSecondary ;
thisButtonIsFakeRight = true ;
}
// otherwise we report double clicks by connecting a left click with a ctrl-left click // otherwise we report double clicks by connecting a left click with a ctrl-left click
if ( clickCount > 1 && button != g_lastButton ) if ( clickCount > 1 && button != g_lastButton )
clickCount = 1 ; clickCount = 1 ;
@@ -281,11 +285,17 @@ void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent )
// mouse down, moved and mouse up, and does not deliver a right down and left up // mouse down, moved and mouse up, and does not deliver a right down and left up
if ( cEvent.GetKind() == kEventMouseDown ) if ( cEvent.GetKind() == kEventMouseDown )
{
g_lastButton = button ; g_lastButton = button ;
g_lastButtonWasFakeRight = thisButtonIsFakeRight ;
}
if ( button == 0 ) if ( button == 0 )
{
g_lastButton = 0 ; g_lastButton = 0 ;
else if ( g_lastButton ) g_lastButtonWasFakeRight = false ;
}
else if ( g_lastButton == kEventMouseButtonSecondary && g_lastButtonWasFakeRight )
button = g_lastButton ; button = g_lastButton ;
// determine the correct down state, wx does not want a 'down' for a mouseUp event, // determine the correct down state, wx does not want a 'down' for a mouseUp event,