Skip to content

Commit 421e8a4

Browse files
samthrmculpepper
samth
authored and
rmculpepper
committed
Add more specific class types instead of Any.
Fixes Insert Large Letters dialog. Merge to 5.3.1. (cherry picked from commit 4124c9a)
1 parent 64826c1 commit 421e8a4

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

‎collects/drracket/private/insert-large-letters.rkt

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
(define-type-alias Bitmap-Message% (Class ()
10-
([parent Any])
10+
([parent (Instance Horizontal-Panel%)])
1111
([set-bm ((Instance Bitmap%) -> Void)])))
1212

1313

@@ -16,7 +16,7 @@
1616

1717
(provide insert-large-letters)
1818

19-
(: insert-large-letters (String Char (Instance Racket:Text%) Any -> Void))
19+
(: insert-large-letters (String Char (Instance Text:Basic%) Any -> Void))
2020
(define (insert-large-letters comment-prefix comment-character edit parent)
2121
(let ([str (make-large-letters-dialog comment-prefix comment-character #f)])
2222
(when (and str
@@ -90,7 +90,7 @@
9090
(: pane2 (Instance Horizontal-Pane%))
9191
(define pane2 (new horizontal-pane% (parent info-bar)))
9292

93-
(: txt (Instance Racket:Text%))
93+
(: txt (Instance Text:Basic%))
9494
(define txt (new racket:text%))
9595
(: ec (Instance Editor-Canvas%))
9696
(define ec (new editor-canvas% [parent dlg] [editor txt]))
@@ -145,7 +145,7 @@
145145
(format " (~a)" (floor (inexact->exact w))))))
146146

147147

148-
(: get-max-line-width ((Instance Racket:Text%) -> Real))
148+
(: get-max-line-width ((Instance Text:Basic%) -> Real))
149149
(define (get-max-line-width txt)
150150
(let loop ([i (+ (send txt last-paragraph) 1)]
151151
[#{m : Integer} 0])
@@ -156,7 +156,7 @@
156156
(send txt paragraph-start-position (- i 1)))))])))
157157

158158

159-
(: render-large-letters (String Char (Instance Font%) String (Instance Racket:Text%) -> (Instance Bitmap%)))
159+
(: render-large-letters (String Char (Instance Font%) String (Instance Text:Basic%) -> (Instance Bitmap%)))
160160
(define (render-large-letters comment-prefix comment-character the-font str edit)
161161
(define bdc (make-object bitmap-dc% (make-object bitmap% 1 1 #t)))
162162
(define-values (tw raw-th td ta) (send bdc get-text-extent str the-font))

‎collects/typed/framework/framework.rkt

+1-16
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,13 @@
99
()
1010
([get-font (-> (Instance Font%))]))))])))
1111

12-
(dt Racket:Text% (Class ()
13-
()
14-
([begin-edit-sequence (-> Void)]
15-
[end-edit-sequence (-> Void)]
16-
[lock (Boolean -> Void)]
17-
[last-position (-> Number)]
18-
[last-paragraph (-> Exact-Nonnegative-Integer)]
19-
[delete (Number Number -> Void)]
20-
[auto-wrap (Any -> Void)]
21-
[paragraph-end-position (Number -> Natural)]
22-
[paragraph-start-position (Number -> Natural)]
23-
[get-start-position (-> Number)]
24-
[get-end-position (-> Number)]
25-
[insert (String Number Number -> Void)])))
26-
2712
(require/typed/provide
2813
framework/framework
2914
[preferences:set-default (Symbol Sexp (Any -> Boolean) -> Void)]
3015
[preferences:set (Symbol Sexp -> Void)]
3116
[editor:get-standard-style-list
3217
(-> (Instance Style-List%))]
33-
[racket:text% Racket:Text%]
18+
[racket:text% Text:Basic%]
3419
[gui-utils:ok/cancel-buttons
3520
((Instance Horizontal-Panel%)
3621
((Instance Button%) (Instance Event%) -> Void)

‎collects/typed/mred/mred.rkt

+26-8
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,30 @@
2020
([parent Any] [width Integer] [label String])
2121
([show (Any -> Void)])))
2222
(dt Text-Field% (Class ()
23-
([parent Any] [callback Any] [label String])
24-
([get-value (-> String)]
25-
[focus (-> Void)])))
23+
([parent (Instance Dialog%)]
24+
[callback (Any Any -> Any)]
25+
[label String])
26+
([get-value (-> String)]
27+
[focus (-> Void)])))
2628
(dt Horizontal-Panel% (Class ()
27-
([parent Any]
29+
([parent (Instance Dialog%)]
2830
[stretchable-height Any #t]
2931
[alignment (List Symbol Symbol) #t])
3032
()))
3133
(dt Choice% (Class ()
32-
([parent Any] [label String] [choices (Listof Any)] [callback Any])
34+
([parent (Instance Horizontal-Panel%)] [label String] [choices (Listof Any)] [callback (Any Any -> Any)])
3335
([get-selection (-> (Option Natural))]
3436
[set-selection (Integer -> Any)]
3537
[get-string-selection (-> (Option String))]
3638
[set-string-selection (String -> Void)])))
3739
(dt Message% (Class ()
38-
([parent Any] [label String])
40+
([parent (Instance Horizontal-Panel%)] [label String])
3941
([set-label ((U String (Instance Bitmap%)) -> Void)])))
4042
(dt Horizontal-Pane% (Class ()
41-
([parent Any])
43+
([parent (Instance Horizontal-Panel%)])
4244
()))
4345
(dt Editor-Canvas% (Class ()
44-
([parent Any] [editor Any])
46+
([parent (Instance Dialog%)] [editor (Instance Text:Basic%)])
4547
([set-line-count ((U #f Integer) -> Void)])))
4648
(dt Bitmap-DC% (Class ((Instance Bitmap%))
4749
()
@@ -55,6 +57,22 @@
5557

5658
(dt Snip% (Class () () ([get-count (-> Integer)])))
5759

60+
(dt Text:Basic% (Class ()
61+
()
62+
([begin-edit-sequence (-> Void)]
63+
[end-edit-sequence (-> Void)]
64+
[lock (Boolean -> Void)]
65+
[last-position (-> Number)]
66+
[last-paragraph (-> Exact-Nonnegative-Integer)]
67+
[delete (Number Number -> Void)]
68+
[auto-wrap (Any -> Void)]
69+
[paragraph-end-position (Number -> Integer)]
70+
[paragraph-start-position (Number -> Integer)]
71+
[get-start-position (-> Integer)]
72+
[get-end-position (-> Integer)]
73+
[get-text (Integer (U Integer 'eof) -> String)]
74+
[insert (String Number Number -> Void)])))
75+
5876
(dt Text% (Class ()
5977
()
6078
([begin-edit-sequence (-> Void)]

0 commit comments

Comments
 (0)