From 3c72c97010ce7ef0bde2291246cb3aaac7c403e2 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 23 Feb 1999 18:04:10 +0000 Subject: [PATCH] . original commit: 9a07cba08a031ffa2e02791f0453f313770eb577 --- collects/tests/mred/draw.ss | 19 ++++++++++++++++--- src/mred/wrap/mred.ss | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/collects/tests/mred/draw.ss b/collects/tests/mred/draw.ss index 46cbef2a..49448cb0 100644 --- a/collects/tests/mred/draw.ss +++ b/collects/tests/mred/draw.ss @@ -115,7 +115,7 @@ (let* ([ofont (send dc get-font)] [otfg (send dc get-text-foreground)] [otbg (send dc get-text-background)] - [obm (send dc get-background-mode)]) + [obm (send dc get-text-mode)]) (if (positive? flevel) (send dc set-font (make-object font% @@ -136,7 +136,7 @@ (send dc set-text-background (make-object color% "YELLOW")) (when (= flevel 2) (send dc set-text-foreground (make-object color% "RED")) - (send dc set-background-mode 'solid)) + (send dc set-text-mode 'solid)) (send dc draw-text (string-append size " Pen") (+ x 5) (+ y 8)) @@ -144,7 +144,7 @@ (when (= flevel 2) (send dc set-text-foreground otfg) - (send dc set-background-mode obm)) + (send dc set-text-mode obm)) (send dc set-text-background otbg) (send dc draw-line @@ -421,6 +421,19 @@ (loop (cdr fam) (cdr stl) (cdr wgt) (cdr sze) x (+ y h)))))) (send dc set-pen save-pen))) + (when last? + (let ([m (send dc get-text-mode)] + [b (send dc get-brush)] + [p (send dc get-pen)]) + (send dc set-pen pen1t) + (send dc set-brush brushs) + (send dc draw-rectangle 295 210 30 20) + (send dc set-text-mode 'xor) + (send dc draw-text "xor" 290 210) + (send dc set-text-mode m) + (send dc set-pen p) + (send dc set-brush b))) + ; Bitmap copying: (when (and (not no-bitmaps?) last?) (let ([x 5] [y 165]) diff --git a/src/mred/wrap/mred.ss b/src/mred/wrap/mred.ss index 91d7a478..c18409d4 100644 --- a/src/mred/wrap/mred.ss +++ b/src/mred/wrap/mred.ss @@ -4078,7 +4078,7 @@ (let ([mb (make-object menu-bar% frame)]) (let ([m (make-object menu% "&File" mb)]) - (make-object menu-item% "Load File..." m (lambda (i e) (let ([f (get-file)]) (and f (evaluate (format "(load ~s)" f)))))) + (make-object menu-item% "Load File..." m (lambda (i e) (let ([f (get-file #f frame)]) (and f (evaluate (format "(load ~s)" f)))))) (make-object menu-item% (if (eq? (system-type) 'windows) "E&xit"