new logic applies to SetFont(wxNullFont), too

[wxWidgets.git] / docs / latex / wx / csconv.tex

diff --git a/docs/latex/wx/csconv.tex b/docs/latex/wx/csconv.tex
index 2d09197bf2a01e15d57535fdd3f38c243a002931..579613615358c006d9b77b3e9de5c9fbb33dae2f 100644 (file)
--- a/docs/latex/wx/csconv.tex
+++ b/docs/latex/wx/csconv.tex
@@ -29,22 +29,19 @@ default user character set.
 
 \func{}{wxCSConv}{\param{const wxChar* }{charset}}
 
-Constructor. Specify the name of the character set you want to convert
-from/to.
+\func{}{wxCSConv}{\param{wxFontEncoding}{encoding}}
 
-\membersection{wxCSConv::\destruct{wxCSConv}}\label{wxcsconvdtor}
+Constructor. You may specify either the name of the character set you want to
+convert from/to or an encoding constant. If the character set name is not
+recognized, ISO 8859-1 is used as fall back.
 
-\func{}{\destruct{wxCSConv}}{\void}
 
-Destructor.
+\membersection{wxCSConv::\destruct{wxCSConv}}\label{wxcsconvdtor}
 
-\membersection{wxCSConv::LoadNow}\label{wxcsconvloadnow}
+\func{}{\destruct{wxCSConv}}{\void}
 
-\func{void}{LoadNow}{\void}
+Destructor frees any resources needed to perform the conversion.
 
-If the conversion tables needs to be loaded from disk, this method
-will do so. Otherwise, they will be loaded when any of the conversion
-methods are called.
 
 \membersection{wxCSConv::MB2WC}\label{wxcsconvmb2wc}
 
@@ -52,6 +49,7 @@ methods are called.
 
 Converts from the selected character set to Unicode. Returns the size of the destination buffer.
 
+
 \membersection{wxCSConv::WC2MB}\label{wxcsconvwc2mb}
 
 \constfunc{size\_t}{WC2MB}{\param{char* }{buf}, \param{const wchar\_t* }{psz}, \param{size\_t }{n}}