--- a/FixedPoint.st	Thu Feb 26 17:37:50 2009 +0100
+++ b/FixedPoint.st	Thu Feb 26 20:13:41 2009 +0100
@@ -204,7 +204,7 @@
     "Modified: / 25.10.1997 / 15:30:29 / cg"
 !
 
-readFrom:aStringOrStream onError:exceptionBlock
+readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters onError:exceptionBlock
     "return an instance of me as described on the string or stream, aStringOrStream.
      If an error occurs during conversion, return the result
      from evaluating exceptionBlock"
@@ -222,7 +222,7 @@
 
     (aStream atEnd or:[aStream peek isLetter]) ifTrue: [^ exceptionBlock value].
 
-    integerPart := (aStream upTo:$.) asNumber.
+    integerPart := (aStream upToAny:decimalPointCharacters) asNumber.
     (aStream atEnd or: [aStream peek isLetter]) ifTrue: [
         fractionPart := 0.
         scale := 1.
@@ -246,7 +246,8 @@
 
     "
      FixedPoint readFrom:'1.00' 
-     FixedPoint readFrom:'123.456' 
+     FixedPoint readFrom:'123.456'  
+     FixedPoint readFrom:'123,456' decimalPointCharacters:','
      FixedPoint readFrom:'-123.456' 
      FixedPoint readFrom:'123' 
      FixedPoint readFrom:'-123' 
@@ -1339,5 +1340,5 @@
 !FixedPoint class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.38 2008-10-21 10:13:46 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/FixedPoint.st,v 1.39 2009-02-26 19:13:41 cg Exp $'
 ! !