--- a/CharacterSetView.st	Wed Mar 05 23:19:15 2014 +0100
+++ b/CharacterSetView.st	Thu Mar 06 15:29:14 2014 +0100
@@ -119,12 +119,12 @@
 openOn:aFont label:viewLabel clickLabel:clickLabel asInputFor:aView encoder:aCharacterEncoderOrNil
     |top panel v bNext bPrev bFirst bLast comboList rangeLabel codePointLabel
      first last next prev enable update updateCodePoint w h
-     minPage maxPage insertCharacter fontMetrics minCode maxCode|
+     minPage maxPage insertCharacter deviceFont minCode maxCode|
 
     aCharacterEncoderOrNil isNil ifTrue:[
-        fontMetrics := (aFont onDevice:Screen current) getFontMetrics.
-        minCode := fontMetrics minCode.
-        maxCode := fontMetrics maxCode.
+        deviceFont := aFont onDevice:Screen current.
+        minCode := deviceFont minCode.
+        maxCode := deviceFont maxCode.
     ] ifFalse:[
         minCode := aCharacterEncoderOrNil minCode.
         maxCode := aCharacterEncoderOrNil maxCode.
@@ -587,10 +587,10 @@
 !CharacterSetView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.31 2014-02-18 17:22:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.32 2014-03-06 14:29:14 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.31 2014-02-18 17:22:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.32 2014-03-06 14:29:14 stefan Exp $'
 ! !