using scroll axis in translation to scrollwin events, avoiding blocking immediate...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 99e9a43640d7301fbcf356b03bbb0c46fdae81b6..090e64bc1b31eca19dfcc0f55780e891f1b77c4d 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -463,6 +463,10 @@ void wxScrollHelper::HandleOnScroll(wxScrollWinEvent& event)
     }
 
     bool needsRefresh = false;
+#ifdef __WXMAC__
+    // OS X blocks on immediate redraws, so make this a refresh
+    needsRefresh = true;
+#endif
     int dx = 0,
         dy = 0;
     int orient = event.GetOrientation();
@@ -1299,7 +1303,7 @@ void wxScrollHelper::HandleOnMouseWheel(wxMouseEvent& event)
         wxScrollWinEvent newEvent;
 
         newEvent.SetPosition(0);
-        newEvent.SetOrientation(wxVERTICAL);
+        newEvent.SetOrientation( event.GetWheelAxis() == 0 ? wxVERTICAL : wxHORIZONTAL);
         newEvent.SetEventObject(m_win);
 
         if (event.IsPageScroll())