From 9fbb7d3a9927a828cc26032bb981b03e47f72a5e Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 31 Oct 2010 19:58:48 -0600
Subject: [PATCH] win32: fix some test failures

---
 collects/mred/private/wx/win32/canvas.rkt   | 29 +++++++++++++--------
 collects/mred/private/wx/win32/list-box.rkt |  4 +--
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/collects/mred/private/wx/win32/canvas.rkt b/collects/mred/private/wx/win32/canvas.rkt
index b222663bff..6bc0803acd 100644
--- a/collects/mred/private/wx/win32/canvas.rkt
+++ b/collects/mred/private/wx/win32/canvas.rkt
@@ -318,7 +318,8 @@
        (when hscroll?
          (SetScrollInfo canvas-hwnd SB_HORZ (make-info h-len h-page h-pos h-scroll-visible?) #t))
        (when vscroll?
-         (SetScrollInfo canvas-hwnd SB_VERT (make-info v-len v-page v-pos v-scroll-visible?) #t)))
+         (SetScrollInfo canvas-hwnd SB_VERT (make-info v-len v-page v-pos v-scroll-visible?) #t))
+       (void))
 
     (define/override (reset-dc-for-autoscroll)
       (reset-dc)
@@ -336,10 +337,12 @@
      (define/public (get-scroll-range which)
        (if (is-auto-scroll?)
            0
-           (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
-             (+ (- (SCROLLINFO-nMax i)
-                   (SCROLLINFO-nPage i))
-                1))))
+           (get-real-scroll-range which)))
+     (define/public (get-real-scroll-range which)
+       (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
+         (+ (- (SCROLLINFO-nMax i)
+               (SCROLLINFO-nPage i))
+            1)))
      (define/public (get-scroll-page which)
        (if (is-auto-scroll?)
            0
@@ -357,7 +360,8 @@
                                                    SIF_DISABLENOSCROLL
                                                    0)))
          (set-SCROLLINFO-nMax! i (+ v (SCROLLINFO-nPage i) -1))
-         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)))
+         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)
+         (void)))
      (define/public (set-scroll-page which v)
        (let ([i (GetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ))])
          (set-SCROLLINFO-fMask! i (bitwise-ior SIF_RANGE SIF_PAGE
@@ -369,7 +373,8 @@
          (set-SCROLLINFO-nMax! i (+ (- (SCROLLINFO-nMax i) (SCROLLINFO-nPage i))
                                     v))
          (set-SCROLLINFO-nPage! i v)
-         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)))
+         (SetScrollInfo canvas-hwnd (if (eq? which 'vertical) SB_VERT SB_HORZ) i #t)
+         (void)))
 
      (define/public (on-scroll e) (void))
      (define/private (on-scroll-change dir part)
@@ -446,10 +451,12 @@
 
      (define/public (scroll x y)
        (when (is-auto-scroll?) 
-         (when (x . > . 0)
-           (set-scroll-pos 'horizontal (->long (* x (get-scroll-range 'horizontal)))))
-         (when (y . > . 0)
-           (set-scroll-pos 'vertical (->long (* y (get-scroll-range 'vertical)))))
+         (when (x . >= . 0)
+           (set-scroll-pos 'horizontal 
+                           (->long (* x (get-real-scroll-range 'horizontal)))))
+         (when (y . >= . 0)
+           (set-scroll-pos 'vertical 
+                           (->long (* y (get-real-scroll-range 'vertical)))))
          (refresh-for-autoscroll)))
 
      (define/public (warp-pointer x y) (void))
diff --git a/collects/mred/private/wx/win32/list-box.rkt b/collects/mred/private/wx/win32/list-box.rkt
index 9510d8e338..8f572f54a3 100644
--- a/collects/mred/private/wx/win32/list-box.rkt
+++ b/collects/mred/private/wx/win32/list-box.rkt
@@ -184,12 +184,12 @@
     (define/public (selected? i)
       (not (zero? (SendMessageW hwnd LB_GETSEL i 0))))
 
-    (define/public (select i [on? #t] [extend? #t])
+    (define/public (select i [on? #t] [one? #t])
       (void
        (if single?
            (SendMessageW hwnd LB_SETCURSEL (if on? i -1) 0)
            (begin
-             (when extend?
+             (unless one?
                (SendMessageW hwnd LB_SELITEMRANGE 0 (MAKELPARAM 0 num)))
              (SendMessageW hwnd LB_SETSEL (if on? 1 0) i)))))