From 777d4d3f899785bcd144b880c0618c9b12442a54 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 26 Nov 2008 16:02:40 +0000
Subject: [PATCH] fix scrollbar reporting so that generic notifies/moves are
 ignored

svn: r12597
---
 src/wxxt/src/Windows/Window.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/wxxt/src/Windows/Window.cc b/src/wxxt/src/Windows/Window.cc
index 975a9ea7a1..e3f2120f86 100644
--- a/src/wxxt/src/Windows/Window.cc
+++ b/src/wxxt/src/Windows/Window.cc
@@ -1622,7 +1622,7 @@ void wxWindow::ScrollEventHandler(Widget    WXUNUSED(w),
 {
   XfwfScrollInfo *sinfo = (XfwfScrollInfo*)p_XfwfScrollInfo;
   wxScrollEvent *wxevent;
-  int dir = 0;
+  int dir = 0, not_understood = 0;
 
   wxWindow *win = (wxWindow *)GET_SAFEREF(winp);
   if (!win) {
@@ -1661,8 +1661,10 @@ void wxWindow::ScrollEventHandler(Widget    WXUNUSED(w),
       win->SetScrollPos(dir = wxHORIZONTAL, win->hs_pos + win->hs_page);
       break;
     case XfwfSTop:
-    case XfwfSLeftSide:
     case XfwfSBottom:
+      dir = wxVERTICAL;
+      break;
+    case XfwfSLeftSide:
     case XfwfSRightSide:
       dir = wxHORIZONTAL;
       break;
@@ -1678,7 +1680,7 @@ void wxWindow::ScrollEventHandler(Widget    WXUNUSED(w),
       }
       break;
     default:
-      dir = wxHORIZONTAL;
+      not_understood = 1;
       break;
     }
     {
@@ -1719,7 +1721,8 @@ void wxWindow::ScrollEventHandler(Widget    WXUNUSED(w),
       break;
     }
 
-    win->OnScroll(wxevent);
+    if (!not_understood)
+      win->OnScroll(wxevent);
 
     wxevent->eventHandle = NULL;
   }