From 658bc59a92c82bdb22d0b654e8c47ef6b16258cc Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Mon, 11 Apr 2011 06:17:28 -0500 Subject: [PATCH] adjust various status controls so they don't take the focus also added a separator menu item to the line/column number popup menu --- collects/drracket/private/bitmap-message.rkt | 3 ++- collects/drracket/private/unit.rkt | 5 +++-- collects/framework/private/frame.rkt | 8 ++++---- collects/framework/private/panel.rkt | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/collects/drracket/private/bitmap-message.rkt b/collects/drracket/private/bitmap-message.rkt index afa90a2c9a..ac0f75a7cf 100644 --- a/collects/drracket/private/bitmap-message.rkt +++ b/collects/drracket/private/bitmap-message.rkt @@ -17,4 +17,5 @@ (min-height (send bm get-height)) (refresh)) (super-new (stretchable-width #f) - (stretchable-height #f)))) + (stretchable-height #f) + (style '(no-focus))))) diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt index 5d58e56f7f..1cf3de999c 100644 --- a/collects/drracket/private/unit.rkt +++ b/collects/drracket/private/unit.rkt @@ -1436,6 +1436,7 @@ module browser threading seems wrong. (define/override (add-line-number-menu-items menu) (define on? (preferences:get 'drracket:show-line-numbers?)) + (new separator-menu-item% [parent menu]) (new checkable-menu-item% [label (string-constant show-line-numbers-in-definitions)] [parent menu] @@ -4262,7 +4263,7 @@ module browser threading seems wrong. (send dc draw-text message (floor (- (/ w 2) (/ tw 2))) (floor (- (/ h 2) (/ th 2))))))))) - (super-new) + (super-new [style '(no-focus)]) (let-values ([(w h d a) (send (get-dc) get-text-extent "Xy")]) (min-height (+ 4 (floor (inexact->exact h))))))) @@ -4341,7 +4342,7 @@ module browser threading seems wrong. (super-new [stretchable-width #f] [stretchable-height #f] - [style '(transparent)]) + [style '(transparent no-focus)]) (inherit min-width min-height) (min-width (apply max (map (λ (x) (send x get-width)) running/waiting-bitmaps))) (min-height (apply max (map (λ (x) (send x get-height)) running/waiting-bitmaps))))) diff --git a/collects/framework/private/frame.rkt b/collects/framework/private/frame.rkt index 05c9968b00..9b7ede9231 100644 --- a/collects/framework/private/frame.rkt +++ b/collects/framework/private/frame.rkt @@ -309,7 +309,7 @@ (min-width 0) (min-height 0))))) - (super-new [style '(transparent)]) + (super-new [style '(transparent no-focus)]) (send (get-dc) set-font small-control-font) (setup-sizes) @@ -669,7 +669,7 @@ (set! memory-canvases (remq ec memory-canvases)))) (send panel stretchable-width #f))) - [define gc-canvas (make-object bday-click-canvas% (get-info-panel) '(border))] + (define gc-canvas (new bday-click-canvas% [parent (get-info-panel)] [style '(border no-focus)])) (define/private (register-gc-blit) (let ([onb (icon:get-gc-on-bitmap)] [offb (icon:get-gc-off-bitmap)]) @@ -776,7 +776,7 @@ (when (and (<= (send evt get-x) cw) (<= (send evt get-y) ch)) (button-up)))))) - (super-new (style '(transparent))) + (super-new (style '(transparent no-focus))) (let ([dc (get-dc)]) (let-values ([(_1 th _2 _3) (send dc get-text-extent str)]) (min-client-height (inexact->exact (floor th))))) @@ -2583,7 +2583,7 @@ (inherit get-dc flush get-client-size min-width min-height) (super-new [stretchable-width #f] [stretchable-height #f] - [style '(transparent)]) + [style '(transparent no-focus)]) (send (get-dc) set-smoothing 'smoothed) (define-values (indicator-width indicator-height) diff --git a/collects/framework/private/panel.rkt b/collects/framework/private/panel.rkt index 364414c8a7..daf59fb4f2 100644 --- a/collects/framework/private/panel.rkt +++ b/collects/framework/private/panel.rkt @@ -488,7 +488,7 @@ (send dc draw-line sx 5 (+ sx three-bar-pen-bar-width) 5) (send dc draw-line sx 8 (+ sx three-bar-pen-bar-width) 8))))) - (super-instantiate ()) + (super-new [style '(no-focus)]) (inherit stretchable-height min-height) (stretchable-height #f) (min-height 10)))