From b78ad419a8dd4c94825ea5cc23452fa8521d3b08 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 6 May 2005 15:26:41 +0000 Subject: [PATCH] . original commit: da0210c7bbdd78c09b11695e40b528d36882c6b8 --- collects/mred/mred-sig.ss | 1 + collects/mred/mred.ss | 1 + collects/mred/private/kernel.ss | 4 ++-- collects/mred/private/mritem.ss | 7 +++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/collects/mred/mred-sig.ss b/collects/mred/mred-sig.ss index f7d95e2a..13e677f7 100644 --- a/collects/mred/mred-sig.ss +++ b/collects/mred/mred-sig.ss @@ -123,6 +123,7 @@ make-namespace-with-mred menu% menu-bar% + menu-control-font menu-item% menu-item-container<%> menu-item<%> diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index 2621257e..44284225 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -273,6 +273,7 @@ small-control-font tiny-control-font view-control-font + menu-control-font timer% readable-snip<%> open-input-text-editor diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss index 76ef0dfb..50f7878f 100644 --- a/collects/mred/private/kernel.ss +++ b/collects/mred/private/kernel.ss @@ -370,8 +370,6 @@ on-event on-paint) (define-private-class dc% dc<%> object% #f - draw-tab - draw-tab-base glyph-exists? end-page end-doc @@ -421,6 +419,8 @@ draw-point draw-line clear) + (define-function draw-tab) + (define-function draw-tab-base) (define-class bitmap-dc% dc% () get-bitmap set-bitmap diff --git a/collects/mred/private/mritem.ss b/collects/mred/private/mritem.ss index 154cee79..32f0042f 100644 --- a/collects/mred/private/mritem.ss +++ b/collects/mred/private/mritem.ss @@ -37,7 +37,8 @@ (define control<%> (interface (subwindow<%>) - command)) + command + get-font)) (define-local-member-name hidden-child? label-checker) @@ -71,7 +72,8 @@ (public [hidden-child? (lambda () #f)] ; module-local method [label-checker (lambda () check-label-string/false)] ; module-local method - [command (lambda (e) (void (callback this e)))]) ; no entry/exit needed + [command (lambda (e) (void (callback this e)))] ; no entry/exit needed + [get-font (lambda (e) (send wx get-font))]) ; no entry/exit needed (private-field [wx #f]) (sequence @@ -471,6 +473,7 @@ (send this -delete-list-item n) (send wx delete n)))] [get-data (entry-point (lambda (n) (check-item 'get-data n) (send wx get-data n)))] + [get-label-font (lambda () (send wx get-label-font))] [get-selections (entry-point (lambda () (send wx get-selections)))] [number-of-visible-items (entry-point (lambda () (send wx number-of-visible-items)))] [is-selected? (entry-point (lambda (n) (check-item 'is-selected? n) (send wx selected? n)))]