From 0836d7a841b9c4841b4178609fb6c9097a236a7a Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 10 Feb 2005 14:55:26 +0000 Subject: [PATCH] . original commit: e0108f44c3208a7be19e33b1da46b0b651f54b36 --- collects/mred/private/moredialogs.ss | 6 ++---- collects/mred/private/mrcontainer.ss | 14 ++------------ 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/collects/mred/private/moredialogs.ss b/collects/mred/private/moredialogs.ss index d474db7a..c4434878 100644 --- a/collects/mred/private/moredialogs.ss +++ b/collects/mred/private/moredialogs.ss @@ -153,10 +153,9 @@ (let* ([f (make-object dialog% title parent box-width)] [ok? #f] [done (lambda (?) (lambda (b e) (set! ok? ?) (send f show #f)))]) - (send f set-label-position 'vertical) (let ([t (make-object text-field% message f (lambda (t e) (when (eq? (send e get-event-type) 'text-field-enter) ((done #t) #f #f))) - init-val (cons 'single style))] + init-val (list* 'single 'vertical-label style))] [p (make-object horizontal-pane% f)]) (send p set-alignment 'right 'center) (send f stretchable-height #f) @@ -191,13 +190,12 @@ [update-ok (lambda (l) (send ok-button enable (not (null? (send l get-selections)))))] [ok? #f] [done (lambda (?) (lambda (b e) (set! ok? ?) (send f show #f)))]) - (send f set-label-position 'vertical) (let ([l (make-object list-box% message choices f (lambda (l e) (update-ok l) (when (eq? (send e get-event-type) 'list-box-dclick) ((done #t) #f #f))) - style)] + (cons 'vertical-label style))] [p (make-object horizontal-pane% f)]) (for-each (lambda (i) (when (>= i (send l get-number)) diff --git a/collects/mred/private/mrcontainer.ss b/collects/mred/private/mrcontainer.ss index c260996a..34763cf5 100644 --- a/collects/mred/private/mrcontainer.ss +++ b/collects/mred/private/mrcontainer.ss @@ -128,21 +128,11 @@ (unless (eq? alignment no-val) (set-alignment . alignment))))) (define area-container-window<%> - (interface (window<%> area-container<%>) - set-control-font get-control-font - set-label-font get-label-font - set-label-position get-label-position)) + (interface (window<%> area-container<%>))) (define (make-area-container-window% %) ; % implements window<%> (and area-container<%>) (class100* % (area-container-window<%>) (mk-wx get-wx-pan mismatches label parent cursor) - (private-field [get-wx-panel get-wx-pan]) - (public - [get-control-font (entry-point (lambda () (send (get-wx-panel) get-control-font)))] - [set-control-font (entry-point (lambda (x) (send (get-wx-panel) set-control-font x)))] - [get-label-font (entry-point (lambda () (send (get-wx-panel) get-label-font)))] - [set-label-font (entry-point (lambda (x) (send (get-wx-panel) set-label-font x)))] - [get-label-position (entry-point (lambda () (send (get-wx-panel) get-label-position)))] - [set-label-position (entry-point (lambda (x) (send (get-wx-panel) set-label-position x)))]) + (private-field [get-wx-panel get-wx-pan]) (sequence (super-init mk-wx get-wx-panel mismatches label parent cursor)))))