From: Stefan Csomor Date: Sun, 4 Feb 2007 06:26:02 +0000 (+0000) Subject: using scroll axis in translation to scrollwin events, avoiding blocking immediate... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6682e732a62044bd25ba7f709b136f68410b88d5 using scroll axis in translation to scrollwin events, avoiding blocking immediate updates when handling the scroll event 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 99e9a43640..090e64bc1b 100644 --- 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())