From 4c67147ae4ca11ed64d71d44a0b7b982691b9b2f Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Thu, 9 Sep 1999 19:31:02 +0000 Subject: [PATCH] ... original commit: b55960e00216c5d466e27ce1a4d397b7121c1e81 --- collects/framework/icon.ss | 2 +- collects/framework/text.ss | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/collects/framework/icon.ss b/collects/framework/icon.ss index 07f64bba..88a0723d 100644 --- a/collects/framework/icon.ss +++ b/collects/framework/icon.ss @@ -34,7 +34,7 @@ (define-values (get-unlock-bitmap) (load-bitmap "unlock.gif" 'gif)) (define get-autowrap-bitmap (load-icon "return.xbm" 'xbm)) - (define get-paren-highlight-bitmap (load-icon "paren.xbm" 'xbm)) + (define get-paren-highlight-bitmap (load-icon "paren.bmp" 'bmp)) (define (make-get/mask filename type) (let ([icon #f] diff --git a/collects/framework/text.ss b/collects/framework/text.ss index 4c52cdd4..01dad253 100644 --- a/collects/framework/text.ss +++ b/collects/framework/text.ss @@ -218,14 +218,16 @@ [b/w-bitmap (rectangle-b/w-bitmap rectangle)] [color (let* ([rc (rectangle-color rectangle)] [tmpc (make-object color% 0 0 0)]) - (if rc - (begin (send dc try-color rc tmpc) - (and (<= (max (abs (- (send rc red) (send tmpc red))) - (abs (- (send rc blue) (send tmpc blue))) - (abs (- (send rc green) (send tmpc green)))) - 50) - rc)) - rc))] + (and + #f + (if rc + (begin (send dc try-color rc tmpc) + (and (<= (max (abs (- (send rc red) (send tmpc red))) + (abs (- (send rc blue) (send tmpc blue))) + (abs (- (send rc green) (send tmpc green)))) + 50) + rc)) + rc)))] [first-number (lambda (x y) (if (number? x) x y))] [left (max left-margin (first-number (rectangle-left rectangle) view-x))] [top (max top-margin (rectangle-top rectangle))]