diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-12 19:43:36 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-12 19:43:36 +0000 |
| commit | 821ad28aad2f8c3cf4bbef9c8ac053943603cc67 (patch) | |
| tree | 741a72dab536c86c7c3d815d93574d1404b42a51 /xorg-server/hw/xquartz/X11Application.m | |
| parent | f18b881b547c558dca584d68d45ace998fa49d18 (diff) | |
| parent | 0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (diff) | |
| download | vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.gz vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.bz2 vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/X11Application.m')
| -rw-r--r-- | xorg-server/hw/xquartz/X11Application.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/X11Application.m b/xorg-server/hw/xquartz/X11Application.m index 749a8932b..f4fbb1abe 100644 --- a/xorg-server/hw/xquartz/X11Application.m +++ b/xorg-server/hw/xquartz/X11Application.m @@ -986,7 +986,7 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe isMouseOrTabletEvent = [e type] == NSLeftMouseDown || [e type] == NSOtherMouseDown || [e type] == NSRightMouseDown || [e type] == NSLeftMouseUp || [e type] == NSOtherMouseUp || [e type] == NSRightMouseUp || [e type] == NSLeftMouseDragged || [e type] == NSOtherMouseDragged || [e type] == NSRightMouseDragged || - [e type] == NSMouseMoved || [e type] == NSTabletPoint; + [e type] == NSMouseMoved || [e type] == NSTabletPoint || [e type] == NSScrollWheel; isTabletEvent = ([e type] == NSTabletPoint) || (isMouseOrTabletEvent && ([e subtype] == NSTabletPointEventSubtype || [e subtype] == NSTabletProximityEventSubtype)); |