suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

racket/gui gtk: fix on-subwindow-... handling

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

Merge to v5.3.1
(cherry picked from commit ba6e383963)
This commit is contained in:
Matthew Flatt 2012-10-27 21:31:08 -06:00 committed by Ryan Culpepper
parent 421e8a469e
commit c0ee979ff4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collects/mred/private/wx/gtk/frame.rkt
View File

@ -169,7 +169,7 @@
(values vbox-gtk panel-gtk)))) (values vbox-gtk panel-gtk))))
(gtk_widget_show vbox-gtk) (gtk_widget_show vbox-gtk)
(gtk_widget_show panel-gtk) (gtk_widget_show panel-gtk)
(connect-key-and-mouse gtk) (connect-enter-and-leave gtk)
(unless is-dialog? (unless is-dialog?
(gtk_window_set_icon_list gtk (cdr (force icon-pixbufs+glist)))) (gtk_window_set_icon_list gtk (cdr (force icon-pixbufs+glist))))

8
collects/mred/private/wx/gtk/window.rkt
View File

@ -35,6 +35,7 @@
connect-focus connect-focus
connect-key-and-mouse connect-key-and-mouse
connect-enter-and-leave
do-button-event do-button-event
(struct-out GtkRequisition) _GtkRequisition-pointer (struct-out GtkRequisition) _GtkRequisition-pointer
@ -293,6 +294,10 @@
(let ([wx (gtk->wx gtk)]) (when wx (send wx leave-window))) (let ([wx (gtk->wx gtk)]) (when wx (send wx leave-window)))
(do-button-event gtk event #f #t))) (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]) (define (connect-key-and-mouse gtk [skip-press? #f])
(connect-key-press gtk) (connect-key-press gtk)
(connect-key-release gtk) (connect-key-release gtk)
@ -300,8 +305,7 @@
(connect-button-press gtk) (connect-button-press gtk)
(unless skip-press? (connect-button-release gtk)) (unless skip-press? (connect-button-release gtk))
(connect-pointer-motion gtk) (connect-pointer-motion gtk)
(connect-enter gtk) (connect-enter-and-leave gtk))
(connect-leave gtk))
(define (do-button-event gtk event motion? crossing?) (define (do-button-event gtk event motion? crossing?)
(let ([type (if motion? (let ([type (if motion?