From c0ee979ff4702d5739e66053e00710b68d1712c5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@mflatt-VirtualBox.(none)>
Date: Sat, 27 Oct 2012 21:31:08 -0600
Subject: [PATCH] racket/gui gtk: fix on-subwindow-... handling

Handling was broken by changes to fix enter and
leave events (in commit a5d7812732)

Merge to v5.3.1
(cherry picked from commit ba6e383963de1c5e64058d99efceb799171827a9)
---
 collects/mred/private/wx/gtk/frame.rkt  | 2 +-
 collects/mred/private/wx/gtk/window.rkt | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/collects/mred/private/wx/gtk/frame.rkt b/collects/mred/private/wx/gtk/frame.rkt
index e9fc5a56b5..fc041d70d6 100644
--- a/collects/mred/private/wx/gtk/frame.rkt
+++ b/collects/mred/private/wx/gtk/frame.rkt
@@ -169,7 +169,7 @@
          (values vbox-gtk panel-gtk))))
     (gtk_widget_show vbox-gtk)
     (gtk_widget_show panel-gtk)
-    (connect-key-and-mouse gtk)
+    (connect-enter-and-leave gtk)
 
     (unless is-dialog?
       (gtk_window_set_icon_list gtk (cdr (force icon-pixbufs+glist))))
diff --git a/collects/mred/private/wx/gtk/window.rkt b/collects/mred/private/wx/gtk/window.rkt
index 87c0d0e66b..643f5a13be 100644
--- a/collects/mred/private/wx/gtk/window.rkt
+++ b/collects/mred/private/wx/gtk/window.rkt
@@ -35,6 +35,7 @@
 
               connect-focus
               connect-key-and-mouse
+	      connect-enter-and-leave
               do-button-event
 
               (struct-out GtkRequisition) _GtkRequisition-pointer
@@ -293,6 +294,10 @@
     (let ([wx (gtk->wx gtk)]) (when wx (send wx leave-window)))
     (do-button-event gtk event #f #t)))
 
+(define (connect-enter-and-leave gtk)
+  (connect-enter gtk)
+  (connect-leave gtk))
+
 (define (connect-key-and-mouse gtk [skip-press? #f])
   (connect-key-press gtk)
   (connect-key-release gtk)
@@ -300,8 +305,7 @@
   (connect-button-press gtk)
   (unless skip-press? (connect-button-release gtk))
   (connect-pointer-motion gtk)
-  (connect-enter gtk)
-  (connect-leave gtk))
+  (connect-enter-and-leave gtk))
 
 (define (do-button-event gtk event motion? crossing?)
   (let ([type (if motion?