Unicodification of wxDataStreams

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/latex/wx/datistrm.tex

@@ -43,13 +43,20 @@ None
 
 \func{}{wxDataInputStream}{\param{wxInputStream\&}{ stream}}
 
+\func{}{wxDataInputStream}{\param{wxInputStream\&}{ stream}, \param{wxMBConv\&}{ conv = wxMBConvUTF8}}
+
 Constructs a datastream object from an input stream. Only read methods will
-be available.
+be available. The second form is only available in Unicode build of wxWindows.
 
 \wxheading{Parameters}
 
 \docparam{stream}{The input stream.}
 
+\docparam{conv}{Charset conversion object object used to decode strings in Unicode 
+mode (see \helpref{wxDataInputStream::ReadString}{wxdatainputstreamreadstring}
+documentation for detailed description). Note that you must not destroy
+{\it conv} before you destroy this wxDataInputStream instance!}
+
 \membersection{wxDataInputStream::\destruct{wxDataInputStream}}
 
 \func{}{\destruct{wxDataInputStream}}{\void}
@@ -89,12 +96,17 @@ Reads a 32 bit integer from the stream.
 
 Reads a double (IEEE encoded) from the stream.
 
-\membersection{wxDataInputStream::ReadString}
+\membersection{wxDataInputStream::ReadString}\label{wxdatainputstreamreadstring}
 
 \func{wxString}{ReadString}{\void}
 
-Reads a string from a stream. Actually, this function first reads a long integer
-specifying the length of the string (without the last null character) and then
-reads the string.
+Reads a string from a stream. Actually, this function first reads a long 
+integer specifying the length of the string (without the last null character) 
+and then reads the string.
 
+In Unicode build of wxWindows, the fuction first reads multibyte (char*)
+string from the stream and then converts it to Unicode using the {\it conv}
+object passed to constructor and returns the result as wxString. You are
+responsible for using the same convertor as when writing the stream.
 
+See also \helpref{wxDataOutputStream::WriteString}{wxdataoutputstreamwritestring}.