--- a/CharacterSetView.st	Fri Mar 05 13:44:20 2004 +0100
+++ b/CharacterSetView.st	Fri Mar 05 18:52:57 2004 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2004 by eXept Software AG
               All Rights Reserved
@@ -107,7 +109,7 @@
      first last next prev enable update updateCodePoint w h
      minPage maxPage insertCharacter|
 
-    minPage := 0.
+    minPage := (aFont onDevice:Screen current) getFontMetrics minCode >> 8.
     maxPage := (aFont onDevice:Screen current) getFontMetrics maxCode >> 8.
 
     top := StandardSystemView new.
@@ -116,6 +118,8 @@
     v := self origin:0.0@0.0 corner:1.0@1.0 in:top.
     v topInset:25.
     v font:aFont.
+    v codePageHolder value:minPage.
+    v characterEncoding:(aFont encoding).
 
     panel := HorizontalPanelView in:top.
     panel origin:(0.0 @ 0.0) corner:(1.0 @ 0.0).
@@ -301,8 +305,12 @@
 !CharacterSetView methodsFor:'change & update'!
 
 update:something with:aParameter from:changedObject
+    |newFont|
+
     something == #font ifTrue:[
-        self font:(masterViewOrNil font).
+        newFont := masterViewOrNil font.
+        self font:newFont.
+        characterEncoding := newFont encoding.
         ^ self.
     ].
     super update:something with:aParameter from:changedObject
@@ -476,5 +484,5 @@
 !CharacterSetView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.18 2004-03-02 16:26:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/CharacterSetView.st,v 1.19 2004-03-05 17:52:57 cg Exp $'
 ! !