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

Pin the menu object while it is displayed, so that it is not garbage collected.

Browse Source
This commit is contained in:
Georges Dupéron 2017-04-29 17:13:58 +02:00
parent ab505859b6
commit b83e861f2e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gui-lib/mred/private/wx/gtk/menu.rkt
View File

@ -76,6 +76,10 @@
(define/public (removing-item) (void)) (define/public (removing-item) (void))
(super-new))) (super-new)))
;; Globally reference any opened menu, so that the menu object stays alive
;; while it is displayed, even if no other code refers to it.
(define global-prevent-gc (make-hasheq))
(defclass menu% widget% (defclass menu% widget%
(init label (init label
callback callback
@ -120,6 +124,8 @@
(define cancel-none-box (box #t)) (define cancel-none-box (box #t))
(define/public (popup x y queue-cb) (define/public (popup x y queue-cb)
;; Pin the menu object so that it is not garbage collected while displayed
(hash-set! global-prevent-gc this #t)
(set! on-popup queue-cb) (set! on-popup queue-cb)
(set! cancel-none-box (box #f)) (set! cancel-none-box (box #f))
(gtk_menu_popup gtk (gtk_menu_popup gtk
@ -148,6 +154,8 @@
(define ignore-callback? #f) (define ignore-callback? #f)
(define/public (do-selected menu-item) (define/public (do-selected menu-item)
;; Allow the menu object to be garbage collected again
(hash-remove! global-prevent-gc this)
;; Called in event-pump thread ;; Called in event-pump thread
(unless ignore-callback? (unless ignore-callback?
(let ([top (get-top-parent)]) (let ([top (get-top-parent)])
@ -167,6 +175,8 @@
[parent (send parent do-selected menu-item)])))) [parent (send parent do-selected menu-item)]))))
(define/public (do-no-selected) (define/public (do-no-selected)
;; Allow the menu object to be garbage collected again
(hash-remove! global-prevent-gc this)
;; Queue a none-selected event, but only tentatively, because ;; Queue a none-selected event, but only tentatively, because
;; the selection event may come later and cancel the none-selected ;; the selection event may come later and cancel the none-selected
;; event. ;; event.