Disable wxUSE_ENH_METAFILE for wxGTK builds.

[wxWidgets.git] / src / generic / scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index ea6ffab2766d35dd0962e30fa5c19f1ca1ab17fc..2135db54f4c3b72feeb380cc1919b342063b6eaf 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -164,9 +164,9 @@ void wxAutoScrollTimer::Notify()
 
             wxMouseState mouseState = wxGetMouseState();
 
-            event2.m_leftDown = mouseState.LeftDown();
-            event2.m_middleDown = mouseState.MiddleDown();
-            event2.m_rightDown = mouseState.RightDown();
+            event2.m_leftDown = mouseState.LeftIsDown();
+            event2.m_middleDown = mouseState.MiddleIsDown();
+            event2.m_rightDown = mouseState.RightIsDown();
 
             event2.m_shiftDown = mouseState.ShiftDown();
             event2.m_controlDown = mouseState.ControlDown();
@@ -1018,6 +1018,9 @@ void wxScrollHelperBase::HandleOnMouseWheel(wxMouseEvent& event)
         newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL);
         newEvent.SetEventObject(m_win);
 
+        if ( event.GetWheelAxis() == wxMOUSE_WHEEL_HORIZONTAL )
+            lines = -lines;
+
         if (event.IsPageScroll())
         {
             if (lines > 0)