fix `set-icon' in frame% to make mask argument optional
Merge to 5.1
This commit is contained in:
parent
f21f0bdba2
commit
f4a881f0e3
|
@ -549,7 +549,7 @@
|
|||
|
||||
(define/public (on-activate on?) (void))
|
||||
|
||||
(define/public (set-icon bm1 bm2 [mode 'both]) (void)) ;; FIXME
|
||||
(define/public (set-icon bm1 [bm2 #f] [mode 'both]) (void)) ;; FIXME
|
||||
|
||||
(define/override (call-pre-on-event w e)
|
||||
(pre-on-event w e))
|
||||
|
|
|
@ -334,7 +334,7 @@
|
|||
|
||||
(define big-icon #f)
|
||||
(define small-icon #f)
|
||||
(define/public (set-icon bm mask [mode 'both])
|
||||
(define/public (set-icon bm [mask #f] [mode 'both])
|
||||
(let ([bm (if mask
|
||||
(let* ([nbm (make-object bitmap%
|
||||
(send bm get-width)
|
||||
|
|
|
@ -527,7 +527,7 @@
|
|||
(define small-hicon #f)
|
||||
(define big-hicon #f)
|
||||
|
||||
(define/public (set-icon bm mask [mode 'both])
|
||||
(define/public (set-icon bm [mask #f] [mode 'both])
|
||||
(let* ([bg-hbitmap
|
||||
(let* ([bm (make-object bitmap% (send bm get-width) (send bm get-height))]
|
||||
[dc (make-object bitmap-dc% bm)])
|
||||
|
|
Loading…
Reference in New Issue
Block a user