From 75008f14d7a46d28262e76de2b9603a54e20c896 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 9 Oct 2012 20:04:33 -0600 Subject: [PATCH] win32: fix combo-field% click handling Closes PR 13173 Merge to v5.3.1 --- collects/mred/private/wx/win32/canvas.rkt | 8 ++++++-- collects/mred/private/wx/win32/item.rkt | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/collects/mred/private/wx/win32/canvas.rkt b/collects/mred/private/wx/win32/canvas.rkt index 8f965dc57c..e1c0f655d0 100644 --- a/collects/mred/private/wx/win32/canvas.rkt +++ b/collects/mred/private/wx/win32/canvas.rkt @@ -90,7 +90,8 @@ is-auto-scroll? is-disabled-scroll? get-virtual-width get-virtual-height reset-auto-scroll - refresh-for-autoscroll) + refresh-for-autoscroll + try-mouse) (define hscroll? (or (memq 'hscroll style) (memq 'auto-hscroll style))) @@ -238,7 +239,10 @@ [else (super wndproc w msg wParam lParam default)])) (define/override (wndproc-for-ctlproc w msg wParam lParam default) - (default w msg wParam lParam)) + ;; act on clicks for a combo field: + (if (try-mouse w msg wParam lParam) + 0 + (default w msg wParam lParam))) (define dc (new dc% [canvas this] [transparent? (memq 'transparent style)])) (send dc start-backing-retained) diff --git a/collects/mred/private/wx/win32/item.rkt b/collects/mred/private/wx/win32/item.rkt index 7140637943..5fedef7d8a 100644 --- a/collects/mred/private/wx/win32/item.rkt +++ b/collects/mred/private/wx/win32/item.rkt @@ -20,7 +20,6 @@ (class % (inherit on-set-focus on-kill-focus - try-mouse wndproc) (init-field [callback void])