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

safe degradation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-02-03 08:32:42 +00:00
parent 20559592cb
commit a533f0504f
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/osx/cocoa/window.mm
View File

@@ -516,19 +516,43 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
case NSScrollWheel : case NSScrollWheel :
{ {
wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ; float deltaX = 0.0;
wxevent.m_wheelDelta = 10; float deltaY = 0.0;
wxevent.m_linesPerAction = 1;
if ( fabs([nsEvent deviceDeltaX]) > fabs([nsEvent deviceDeltaY]) ) wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
// see http://developer.apple.com/qa/qa2005/qa1453.html
// for more details on why we have to look for the exact type
const EventRef cEvent = (EventRef) [nsEvent eventRef];
bool isMouseScrollEvent = false;
if ( cEvent )
isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
if ( isMouseScrollEvent )
{ {
wxevent.m_wheelAxis = 1; deltaX = [nsEvent deviceDeltaX];
wxevent.m_wheelRotation = (int)[nsEvent deviceDeltaX]; deltaY = [nsEvent deviceDeltaY];
} }
else else
{ {
wxevent.m_wheelRotation = (int)[nsEvent deviceDeltaY]; deltaX = ([nsEvent deltaX] * 10);
deltaY = ([nsEvent deltaY] * 10);
} }
wxevent.m_wheelDelta = 10;
wxevent.m_linesPerAction = 1;
if ( fabs(deltaX) > fabs(deltaY) )
{
wxevent.m_wheelAxis = 1;
wxevent.m_wheelRotation = (int)deltaX;
}
else
{
wxevent.m_wheelRotation = (int)deltaY;
}
} }
break ; break ;