merged 2.2 branch

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

docs/latex/wx/mbcnvut7.tex

@@ -0,0 +1,38 @@
+%
+% automatically generated by HelpGen from
+% ../include/wx/strconv.h at 25/Mar/00 10:20:56
+%
+
+\section{\class{wxMBConvUTF7}}\label{wxmbconvutf7}
+
+This class converts between the UTF-7 encoding and Unicode.
+It has one predefined instance, {\bf wxConvUTF7}.
+Unfortunately, this class is not quite implemented yet.
+
+\wxheading{Derived from}
+
+\helpref{wxMBConv}{wxmbconv}
+
+\wxheading{Include files}
+
+<wx/strconv.h>
+
+\wxheading{See also}
+
+\helpref{wxMBConvUTF8}{wxmbconvutf8}, 
+\helpref{wxMBConv classes overview}{mbconvclasses}
+
+\latexignore{\rtfignore{\wxheading{Members}}}
+
+\membersection{wxMBConvUTF7::MB2WC}\label{wxmbconvutf7mb2wc}
+
+\constfunc{size\_t}{MB2WC}{\param{wchar\_t* }{buf}, \param{const char* }{psz}, \param{size\_t }{n}}
+
+Converts from UTF-7 encoding to Unicode. Returns the size of the destination buffer.
+
+\membersection{wxMBConvUTF7::WC2MB}\label{wxmbconvutf7wc2mb}
+
+\constfunc{size\_t}{WC2MB}{\param{char* }{buf}, \param{const wchar\_t* }{psz}, \param{size\_t }{n}}
+
+Converts from Unicode to UTF-7 encoding. Returns the size of the destination buffer.
+