From 0648556bea202e7f541699d4b6e64a0dfa6be557 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 13 Aug 2012 10:51:52 -0600
Subject: [PATCH] racket/gui: internal cleanup

As suggested by Robby.
---
 collects/mred/private/wx/win32/key.rkt    | 24 ++++++++++++-----------
 collects/mred/private/wx/win32/window.rkt |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/collects/mred/private/wx/win32/key.rkt b/collects/mred/private/wx/win32/key.rkt
index 4b97bed2df..04e12764c4 100644
--- a/collects/mred/private/wx/win32/key.rkt
+++ b/collects/mred/private/wx/win32/key.rkt
@@ -7,7 +7,7 @@
          "../common/event.rkt")
 
 (provide
- (protect-out make-key-event
+ (protect-out maybe-make-key-event
               generates-key-event?
 	      reset-key-mapping
               key-symbol-to-menu-key))
@@ -18,15 +18,17 @@
 
 (define (generates-key-event? msg)
   (let ([message (MSG-message msg)])
-    (and (memq message (list WM_KEYDOWN WM_SYSKEYDOWN
-                             WM_KEYUP WM_SYSKEYUP))
-         (make-key-event #t 
-                         (MSG-wParam msg)
-                         (MSG-lParam msg)
-                         #f
-                         (or (= message WM_KEYUP)
-                             (= message WM_SYSKEYUP))
-			 (MSG-hwnd msg)))))
+    (and (or (eq? message WM_KEYDOWN)
+             (eq? message WM_SYSKEYDOWN)
+             (eq? message WM_KEYUP)
+             (eq? message WM_SYSKEYUP))
+         (maybe-make-key-event #t 
+                               (MSG-wParam msg)
+                               (MSG-lParam msg)
+                               #f
+                               (or (= message WM_KEYUP)
+                                   (= message WM_SYSKEYUP))
+                               (MSG-hwnd msg)))))
 
 (define (THE_SCAN_CODE lParam)
   (bitwise-and (arithmetic-shift lParam -16) #x1FF))
@@ -126,7 +128,7 @@
           VK_SCROLL 'scroll))
 
 
-(define (make-key-event just-check? wParam lParam is-char? is-up? hwnd)
+(define (maybe-make-key-event just-check? wParam lParam is-char? is-up? hwnd)
   (let* ([control-down? (not (zero? (arithmetic-shift (GetKeyState VK_CONTROL) -1)))]
          [rcontrol-down? (and control-down?
                               (not (zero? (arithmetic-shift (GetKeyState VK_RCONTROL) -1))))]
diff --git a/collects/mred/private/wx/win32/window.rkt b/collects/mred/private/wx/win32/window.rkt
index e43f21540d..256a560730 100644
--- a/collects/mred/private/wx/win32/window.rkt
+++ b/collects/mred/private/wx/win32/window.rkt
@@ -523,7 +523,7 @@
           (loop (sub1 delta))))))
   
   (define/private (do-key w msg wParam lParam is-char? is-up? default)
-    (let ([e (make-key-event #f wParam lParam is-char? is-up? hwnd)])
+    (let ([e (maybe-make-key-event #f wParam lParam is-char? is-up? hwnd)])
       (if (and e
                (if (definitely-wants-event? w msg wParam e)
                    (begin