fix some uses of not-yet-defined fields

This commit is contained in:
Matthew Flatt 2014-04-03 16:33:14 -06:00
parent 16869bb4dd
commit 113a2eea21
3 changed files with 11 additions and 10 deletions

View File

@ -366,6 +366,10 @@
(define is-gl? (and (not is-combo?) (memq 'gl style))) (define is-gl? (and (not is-combo?) (memq 'gl style)))
(define/public (can-gl?) is-gl?) (define/public (can-gl?) is-gl?)
(define dc #f)
(define blits null)
(define reg-blits null)
(super-new (super-new
[parent parent] [parent parent]
[cocoa [cocoa
@ -421,7 +425,7 @@
(tellv content-cocoa setDelegate: content-cocoa) (tellv content-cocoa setDelegate: content-cocoa)
(install-control-font content-cocoa #f)) (install-control-font content-cocoa #f))
(define dc (make-object dc% this (memq 'transparent canvas-style))) (set! dc (make-object dc% this (memq 'transparent canvas-style)))
(send dc start-backing-retained) (send dc start-backing-retained)
@ -864,9 +868,6 @@
(define/public (is-flipped?) (define/public (is-flipped?)
(tell #:type _BOOL (get-cocoa-content) isFlipped)) (tell #:type _BOOL (get-cocoa-content) isFlipped))
(define blits null)
(define reg-blits null)
(define/private (suspend-all-reg-blits) (define/private (suspend-all-reg-blits)
(let ([cocoa-win (get-cocoa-window)]) (let ([cocoa-win (get-cocoa-window)])
(for ([r (in-list reg-blits)]) (for ([r (in-list reg-blits)])

View File

@ -461,6 +461,10 @@
cocoa cocoa
[no-show? #f]) [no-show? #f])
(define is-on? #f)
(define accept-drag? #f)
(define accept-parent-drag? #f)
(super-new) (super-new)
(queue-autorelease-flush) (queue-autorelease-flush)
@ -522,7 +526,6 @@
(define/public (get-eventspace) eventspace) (define/public (get-eventspace) eventspace)
(define is-on? #f)
(define/public (show on?) (define/public (show on?)
(atomically (atomically
(unless (eq? (and on? #t) is-on?) (unless (eq? (and on? #t) is-on?)
@ -674,9 +677,6 @@
(define/public (move x y) (define/public (move x y)
(internal-move x y)) (internal-move x y))
(define accept-drag? #f)
(define accept-parent-drag? #f)
(define/public (on-drop-file f) (void)) (define/public (on-drop-file f) (void))
(define/public (do-on-drop-file f) (define/public (do-on-drop-file f)
(if accept-drag? (if accept-drag?

View File

@ -116,8 +116,6 @@
;; methods: ;; methods:
(define (canvas-mixin %) (define (canvas-mixin %)
(class % (class %
(super-new)
(inherit request-canvas-flush-delay (inherit request-canvas-flush-delay
cancel-canvas-flush-delay cancel-canvas-flush-delay
queue-canvas-refresh-event queue-canvas-refresh-event
@ -132,6 +130,8 @@
;; of queued paint: ;; of queued paint:
(define paint-queued #f) ; #f or (box #t) (define paint-queued #f) ; #f or (box #t)
(super-new)
(define/override (queue-paint) (define/override (queue-paint)
;; can be called from any thread, including the event-pump thread ;; can be called from any thread, including the event-pump thread
(unless paint-queued (unless paint-queued