From 848d036162187700352aa4a7fc4c832e850e66c0 Mon Sep 17 00:00:00 2001 From: fcolin Date: Fri, 25 May 2007 12:13:34 +0000 Subject: correction d'un problème de gestion des accents dans IvyTabletPC reco remplacement de l'encoding ASCII par iso 8859-15 --- Ivy/Ivy.cs | 2 ++ Ivy/IvyTCPStreamV3.cs | 4 ++-- Ivy/IvyTCPStreamV4.cs | 4 ++-- Ivy/IvyUDPStreamV3.cs | 4 ++-- Ivy/IvyUDPStreamV4.cs | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) (limited to 'Ivy') diff --git a/Ivy/Ivy.cs b/Ivy/Ivy.cs index 428da49..d8e84ce 100644 --- a/Ivy/Ivy.cs +++ b/Ivy/Ivy.cs @@ -281,6 +281,8 @@ namespace IvyBus internal ushort applicationPriority = DEFAULT_PRIORITY; private string ready_message; private CultureInfo culture = new CultureInfo("en-us"); + internal static Encoding ivyEncoding = Encoding.GetEncoding("iso-8859-15"); // ASCII 8 bits iso-8859-2 + // for synchronous event #if (PocketPC) private System.Windows.Forms.ContainerControl parentControl; diff --git a/Ivy/IvyTCPStreamV3.cs b/Ivy/IvyTCPStreamV3.cs index 4eef12c..594f9de 100644 --- a/Ivy/IvyTCPStreamV3.cs +++ b/Ivy/IvyTCPStreamV3.cs @@ -24,9 +24,9 @@ namespace IvyBus internal IvyTCPStreamV3(Socket socket, IvyProtocol _receiver) : base ( socket ) { - output = new StreamWriter(this, Encoding.ASCII); + output = new StreamWriter(this, Ivy.ivyEncoding); output.NewLine = MSG_END.ToString(); - input = new StreamReader(this, Encoding.ASCII); + input = new StreamReader(this, Ivy.ivyEncoding); receiver = _receiver; } /* the protocol magic numbers */ diff --git a/Ivy/IvyTCPStreamV4.cs b/Ivy/IvyTCPStreamV4.cs index 9a96d62..d477908 100644 --- a/Ivy/IvyTCPStreamV4.cs +++ b/Ivy/IvyTCPStreamV4.cs @@ -39,8 +39,8 @@ namespace IvyBus internal IvyTCPStreamV4(Socket socket, IvyProtocol _receiver) : base( socket ) { - input = new BinaryReader(this, Encoding.ASCII); - output = new BinaryWriter(this, Encoding.ASCII); + input = new BinaryReader(this, Ivy.ivyEncoding ); + output = new BinaryWriter(this, Ivy.ivyEncoding ); receiver = _receiver; } diff --git a/Ivy/IvyUDPStreamV3.cs b/Ivy/IvyUDPStreamV3.cs index 63a8679..8f48f3b 100644 --- a/Ivy/IvyUDPStreamV3.cs +++ b/Ivy/IvyUDPStreamV3.cs @@ -17,8 +17,8 @@ namespace IvyBus public IvyUDPStreamV3(Socket _socket) : base( _socket , PROCOCOLVERSION ) { - input = new StreamReader(in_stream, Encoding.ASCII); - output = new StreamWriter(out_stream, Encoding.ASCII); + input = new StreamReader(in_stream, Ivy.ivyEncoding); + output = new StreamWriter(out_stream, Ivy.ivyEncoding); } /* * message Syntax: diff --git a/Ivy/IvyUDPStreamV4.cs b/Ivy/IvyUDPStreamV4.cs index b8d329a..4f0a8fc 100644 --- a/Ivy/IvyUDPStreamV4.cs +++ b/Ivy/IvyUDPStreamV4.cs @@ -17,8 +17,8 @@ namespace IvyBus internal const ushort PROCOCOLVERSION = 4; public IvyUDPStreamV4(Socket _socket) : base ( _socket, PROCOCOLVERSION) { - input = new BinaryReader( in_stream,Encoding.ASCII); - output = new BinaryWriter(out_stream, Encoding.ASCII); + input = new BinaryReader(in_stream, Ivy.ivyEncoding); + output = new BinaryWriter(out_stream, Ivy.ivyEncoding); } /* * message Syntax: -- cgit v1.1