From 349fd64bbefdf36d9551e03e1ed4029b6d7b1093 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 29 Jul 2008 23:00:02 +0000 Subject: [PATCH] fixed a bug in searching; typing control-g without opening the search window crashes svn: r10977 original commit: ff8578ca1396d85c4683c4316314bb755cc324dd --- collects/framework/private/frame.ss | 16 ++++++++-------- collects/framework/private/text.ss | 6 ++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index 8576b4da..431af2fe 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -2080,14 +2080,14 @@ (when search-gui-built? (send super-root change-children (λ (l) - (remove search/replace-panel l)))) - (clear-search-highlight) - (send find-edit text-to-search-changed text-to-search #f) - (when text-to-search - (send text-to-search set-search-anchor #f) - (let ([canvas (send text-to-search get-canvas)]) - (when canvas - (send canvas focus)))) + (remove search/replace-panel l))) + (clear-search-highlight) + (send find-edit text-to-search-changed text-to-search #f) + (when text-to-search + (send text-to-search set-search-anchor #f) + (let ([canvas (send text-to-search get-canvas)]) + (when canvas + (send canvas focus))))) (set! hidden? #t)) (define/public (unhide-search focus?) diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss index 0e56bf51..c1fc7691 100644 --- a/collects/framework/private/text.ss +++ b/collects/framework/private/text.ss @@ -944,8 +944,10 @@ WARNING: printf is rebound in the body of the unit to always (define delegate-mixin (mixin (basic<%>) (delegate<%>) - (inherit split-snip find-snip get-snip-position - find-first-snip get-style-list set-tabs) + (inherit split-snip find-snip + get-snip-position + find-first-snip + get-style-list set-tabs) (define linked-snips #f)