--- a/CharacterSetView.st	Thu Feb 13 16:53:57 2014 +0100
+++ b/CharacterSetView.st	Thu Feb 13 19:23:31 2014 +0100
@@ -390,7 +390,7 @@
     wCol := width / 16.
     hRow := height / 16.
 
-    dY := (hRow - (font height)) // 2 + (font ascent).
+    dY := (hRow - (gc font height)) // 2 + (gc font ascent).
 
     0 to:15 do:[:row |
         |y0 y1 y rowBase|
@@ -421,7 +421,7 @@
             x := x0 := (col * wCol) rounded asInteger.
             x := x rounded asInteger.
             x := x + (wCol / 2).
-            x := x - ((font widthOf:s) // 2).
+            x := x - ((gc font widthOf:s) // 2).
 
             x1 := ((col+1) * wCol) rounded asInteger.
             x1 := x1 rounded asInteger.
@@ -579,18 +579,18 @@
         ^ preferredExtent
     ].
 
-    ^ ((4 + font width + 4) * 16)
+    ^ ((4 + gc font width + 4) * 16)
        @
-      ((4 + font height + 4) * 16)
+      ((4 + gc font height + 4) * 16)
 ! !
 
 !CharacterSetView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.29 2013-09-01 00:06:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.30 2014-02-13 18:23:31 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.29 2013-09-01 00:06:36 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.30 2014-02-13 18:23:31 stefan Exp $'
 ! !