From 04a8e21cf2ed32baf05d747b0a663f173513281c Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 11 Apr 2009 14:48:23 +0000 Subject: [PATCH] fix style font-face problem svn: r14491 --- collects/mred/private/wxme/style.ss | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/collects/mred/private/wxme/style.ss b/collects/mred/private/wxme/style.ss index 7e1666c7bd..758ed999af 100644 --- a/collects/mred/private/wxme/style.ss +++ b/collects/mred/private/wxme/style.ss @@ -663,19 +663,17 @@ (cons (send font get-family) (send font get-face))) (let ([fam (style-delta-family nonjoin-delta)]) - (if (eq? fam 'base) - (cons (send (send base get-s-font) get-family) - #f) - (if (style-delta-face nonjoin-delta) - (cons fam (style-delta-face nonjoin-delta)) - (cons fam #f)))))] + (cons (if (eq? fam 'base) + (send (send base get-s-font) get-family) + fam) + (style-delta-face nonjoin-delta))))] [style (match-field style 'normal)] [weight (match-field weight 'normal)] [smoothing (match-field smoothing 'default)] [alignment (match-field* alignment 'bottom target)] [underlined (match-bool underlined (-send-get underlined (send base get-s-font)))] [size-in-pixels (match-bool size-in-pixels (-send-get size-in-pixels (send base get-s-font)))]) - + (send target set-s-alignment alignment) (let ([font (if (cdr fam+face)