From c760197bd05a8882a38aa2824521271f82859571 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 11 Oct 2011 16:15:40 -0600 Subject: [PATCH] fix framework doc reference to `set-icon' method Merge to 5.2 (cherry picked from commit f2082e6eeb4a41ad6e1c33416fa4ae59430362a2) --- collects/framework/main.rkt | 4 ++-- collects/scribblings/framework/frame.scrbl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collects/framework/main.rkt b/collects/framework/main.rkt index 5b23f4795f..383b502783 100644 --- a/collects/framework/main.rkt +++ b/collects/framework/main.rkt @@ -707,10 +707,10 @@ @racket[frame:basic-mixin]. @itemize[ @item{If it is @racket[#f], then its value is ignored.} - @item{If it is a @racket[bitmap%], then the @method[frame% set-icon] is + @item{If it is a @racket[bitmap%], then the @method[top-level-window<%> set-icon] is called with the bitmap, the result of invoking the @racket[bitmap% get-loaded-mask] method, and @racket['both].} - @item{If it is a pair of bitmaps, then the @method[frame% set-icon] + @item{If it is a pair of bitmaps, then the @method[top-level-window<%> set-icon] method is invoked twice, once with each bitmap in the pair. The first bitmap is passed (along with the result of its @racket[bitmap% get-loaded-mask]) and @racket['small], and then the diff --git a/collects/scribblings/framework/frame.scrbl b/collects/scribblings/framework/frame.scrbl index 11c71d5332..f77140e24e 100644 --- a/collects/scribblings/framework/frame.scrbl +++ b/collects/scribblings/framework/frame.scrbl @@ -113,7 +113,7 @@ This mixin calls its @method[window<%> accept-drop-files] with @racket[#t]. - It also calls its @method[frame% set-icon] method according to the current + It also calls its @method[top-level-window<%> set-icon] method according to the current value of @racket[frame:current-icon]. See also @racket[frame:reorder-menus].