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

better wheel support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-01-25 17:12:53 +00:00
parent 1814b27e45
commit 83ffdd7111
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -375,6 +375,14 @@ void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, N
UInt32 g_lastButton = 0 ; UInt32 g_lastButton = 0 ;
bool g_lastButtonWasFakeRight = false ; bool g_lastButtonWasFakeRight = false ;
// better scroll wheel support
// see http://lists.apple.com/archives/cocoa-dev/2007/Feb/msg00050.html
@interface NSEvent (DeviceDelta)
- (float)deviceDeltaX;
- (float)deviceDeltaY;
@end
void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
{ {
int eventType = [nsEvent type]; int eventType = [nsEvent type];
@@ -512,14 +520,14 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
wxevent.m_wheelDelta = 10; wxevent.m_wheelDelta = 10;
wxevent.m_linesPerAction = 1; wxevent.m_linesPerAction = 1;
if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) ) if ( fabs([nsEvent deviceDeltaX]) > fabs([nsEvent deviceDeltaY]) )
{ {
wxevent.m_wheelAxis = 1; wxevent.m_wheelAxis = 1;
wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10); wxevent.m_wheelRotation = (int)[nsEvent deviceDeltaX];
} }
else else
{ {
wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10); wxevent.m_wheelRotation = (int)[nsEvent deviceDeltaY];
} }
} }
break ; break ;