diff --git a/collects/framework/private/icon.ss b/collects/framework/private/icon.ss index 038f1f8e..5092e826 100644 --- a/collects/framework/private/icon.ss +++ b/collects/framework/private/icon.ss @@ -57,8 +57,21 @@ (set! icon (make-object bitmap% p type)) icon))))) - ;(define get (make-get/mask "plt16x16.bmp" 'bmp)) - ;(define get-mask (make-get/mask "dot16x16.xbm" 'xbm)) + + (define (make-cursor name fallback) + (let ([csr (make-object cursor% + (build-path (collection-path "icons") name) + 'gif + 8 + 8)]) + (if (send csr ok?) + csr + (make-object cursor% fallback)))) + + (define up/down-cursor (make-cursor "up-down-cursor.gif" 'size-n/s)) + (define (get-up/down-cursor) up/down-cursor) + (define left/right-cursor (make-cursor "left-right-cursor.gif" 'size-e/w)) + (define (get-left/right-cursor) left/right-cursor) (define gc-on-bitmap #f) diff --git a/collects/framework/private/panel.ss b/collects/framework/private/panel.ss index 84187377..bc85c239 100644 --- a/collects/framework/private/panel.ss +++ b/collects/framework/private/panel.ss @@ -13,7 +13,8 @@ (define panel@ (unit/sig framework:panel^ - (import mred^) + (import [icon : framework:icon^] + mred^) (rename [-editor<%> editor<%>]) @@ -175,8 +176,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - (define up/down-cursor (make-object cursor% 'size-n/s)) - ;; type gap = (make-gap number area<%> percentage number area<%> percentage) (define-struct gap (before before-y before-percentage after after-y after-percentage)) @@ -261,7 +260,7 @@ cursor-gaps)]) (set-cursor (and (or gap resizing-y) - up/down-cursor)) + (icon:get-up/down-cursor))) (cond [(and gap (send evt button-down? 'left)) (set! resizing-y (send evt get-y)) diff --git a/collects/framework/private/sig.ss b/collects/framework/private/sig.ss index 514079c1..c36353bc 100644 --- a/collects/framework/private/sig.ss +++ b/collects/framework/private/sig.ss @@ -237,6 +237,9 @@ get-lock-bitmap get-unlock-bitmap get-anchor-bitmap + + get-left/right-cursor + get-up/down-cursor get-gc-on-bitmap get-gc-off-bitmap))