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

Removed OS X code targeted at versions prior to OS X 10.7.

Browse Source 
At least 10.7 is required in 3.1 anyhow, so don't check for it needlessly.

See https://github.com/wxWidgets/wxWidgets/pull/55
This commit is contained in:
Tobias Taschner
2015-08-01 21:40:59 +02:00
committed by Vadim Zeitlin
parent 00dacea7de
commit ab065e1ad9
4 changed files with 12 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,39 +683,15 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
if ( UMAGetSystemVersion() >= 0x1070 )
if ( [nsEvent hasPreciseScrollingDeltas] )
{
if ( [nsEvent hasPreciseScrollingDeltas] )
{
deltaX = [nsEvent scrollingDeltaX];
deltaY = [nsEvent scrollingDeltaY];
}
else
{
deltaX = [nsEvent scrollingDeltaX] * 10;
deltaY = [nsEvent scrollingDeltaY] * 10;
}
deltaX = [nsEvent scrollingDeltaX];
deltaY = [nsEvent scrollingDeltaY];
}
else
{
const EventRef cEvent = (EventRef) [nsEvent eventRef];
// see http://developer.apple.com/qa/qa2005/qa1453.html
// for more details on why we have to look for the exact type
bool isMouseScrollEvent = false;
if ( cEvent )
isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
if ( isMouseScrollEvent )
{
deltaX = [nsEvent deviceDeltaX];
deltaY = [nsEvent deviceDeltaY];
}
else
{
deltaX = ([nsEvent deltaX] * 10);
deltaY = ([nsEvent deltaY] * 10);
}
deltaX = [nsEvent scrollingDeltaX] * 10;
deltaY = [nsEvent scrollingDeltaY] * 10;
}
wxevent.m_wheelDelta = 10;