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

racket/gui cocoa: fix crashing bug with combo-field%

Browse Source 
Merge to v6.0
(cherry picked from commit 9a120f6acc)
This commit is contained in:
Matthew Flatt 2013-11-22 12:03:16 -07:00 committed by Ryan Culpepper
parent 687ed81d29
commit c044d0097a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/canvas.rkt
View File

@ -692,12 +692,13 @@
#t) #t)
(define/public (on-combo-select i) (void)) (define/public (on-combo-select i) (void))
(define/public (popup-combo) (define/public (popup-combo)
;; Pending refresh events intefere with combo popups ;; Pending refresh events interfere with combo popups
;; for some reason, so flush them: ;; for some reason, so flush them:
(yield-refresh) (yield-refresh)
(flush) (flush)
;; Beware that the `popUp:' method is undocumented: ;; Beware that the `popUp:' method is undocumented:
(tellv (tell content-cocoa cell) popUp: #f)) (atomically
(tellv (tell content-cocoa cell) popUp: #f)))
(define clear-bg? (and (not (memq 'transparent canvas-style)) (define clear-bg? (and (not (memq 'transparent canvas-style))
(not (memq 'no-autoclear canvas-style)))) (not (memq 'no-autoclear canvas-style))))

5
pkgs/gui-pkgs/gui-test/tests/gracket/item.rkt
View File

@ -1708,7 +1708,9 @@
(define (combo-frame empty?) (define (combo-frame empty?)
(define f (make-frame frame% "Combo Test")) (define f (make-frame frame% "Combo Test"))
(define p f) (define p f)
(define actual-content '("Apple" "Banana")) (define actual-content (if empty?
null
'("Apple" "Banana")))
(define (callback c e) (void)) (define (callback c e) (void))
(define c (make-object (class combo-field% (define c (make-object (class combo-field%
(define/override (on-popup e) (define/override (on-popup e)
@ -2402,6 +2404,7 @@
(make-object button% "Make Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #f))) (make-object button% "Make Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #f)))
(make-object button% "Make Empty Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #t))) (make-object button% "Make Empty Choice Frame" cp (lambda (b e) (choice-or-list-frame #f null #t)))
(make-object button% "Make Combo Frame" cp (lambda (b e) (combo-frame #f))) (make-object button% "Make Combo Frame" cp (lambda (b e) (combo-frame #f)))
(make-object button% "Make Empty Combo Frame" cp (lambda (b e) (combo-frame #t)))
(define lcp (make-object horizontal-pane% ap)) (define lcp (make-object horizontal-pane% ap))
(send lcp stretchable-width #f) (send lcp stretchable-width #f)
(define list-columns-choice (new choice% (define list-columns-choice (new choice%