From aea37008b79b8415dc25156f843287827b62ce3a Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 4 Feb 2007 06:24:28 +0000 Subject: [PATCH] adding scroll axis to wheel events git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 10 ++++++++-- src/common/event.cpp | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index d4342e8b06..a575c3ab23 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -855,10 +855,15 @@ public: // should occur for each delta. int GetWheelDelta() const { return m_wheelDelta; } + // Gets the axis the wheel operation concerns, 0 being the y axis as on + // most mouse wheels, 1 is the x axis for things like MightyMouse scrolls + // or horizontal trackpad scrolling + int GetWheelAxis() const { return m_wheelAxis; } + // Returns the configured number of lines (or whatever) to be scrolled per // wheel action. Defaults to one. int GetLinesPerAction() const { return m_linesPerAction; } - + // Is the system set to do page scrolling? bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } @@ -877,7 +882,8 @@ public: bool m_shiftDown; bool m_altDown; bool m_metaDown; - + + int m_wheelAxis; int m_wheelRotation; int m_wheelDelta; int m_linesPerAction; diff --git a/src/common/event.cpp b/src/common/event.cpp index 06dbaf5644..385f516040 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -539,6 +539,7 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType) m_wheelRotation = 0; m_wheelDelta = 0; m_linesPerAction = 0; + m_wheelAxis = 0; } void wxMouseEvent::Assign(const wxMouseEvent& event) @@ -560,6 +561,7 @@ void wxMouseEvent::Assign(const wxMouseEvent& event) m_wheelRotation = event.m_wheelRotation; m_wheelDelta = event.m_wheelDelta; m_linesPerAction = event.m_linesPerAction; + m_wheelAxis = event.m_wheelAxis; } // return true if was a button dclick event -- 2.45.2