X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e24c2af0f22f9fff6922885eed7a1bef1b92112..47c1bb951559435fe15ac316218f318a1f650f70:/interface/strconv.h

diff --git a/interface/strconv.h b/interface/strconv.h
index 834401a506..fafa722f2b 100644
--- a/interface/strconv.h
+++ b/interface/strconv.h
@@ -18,7 +18,7 @@
     @library{wxbase}
     @category{FIXME}
 
-    @see wxMBConvUTF8, @ref overview_mbconvclasses "wxMBConv classes overview"
+    @see wxMBConvUTF8, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConvUTF7 : public wxMBConv
 {
@@ -48,7 +48,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see wxMBConvUTF7, @ref overview_mbconvclasses "wxMBConv classes overview"
+    @see wxMBConvUTF7, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConvUTF8 : public wxMBConv
 {
@@ -83,8 +83,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see wxMBConvUTF8, wxMBConvUTF32, @ref overview_mbconvclasses "wxMBConv classes
-    overview"
+    @see wxMBConvUTF8, wxMBConvUTF32, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConvUTF16 : public wxMBConv
 {
@@ -115,21 +114,24 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see wxMBConv, wxEncodingConverter, @ref overview_mbconvclasses "wxMBConv
-    classes overview"
+    @see wxMBConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxCSConv : public wxMBConv
 {
 public:
-    //@{
     /**
-        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 (or the
-        encoding) is not recognized, ISO 8859-1 is used as fall back.
+        Constructor. You can specify the name of the character set you want to
+        convert from/to. If the character set name is not recognized, ISO 8859-1
+        is used as fall back.
     */
     wxCSConv(const wxChar* charset);
+    
+    /**
+        Constructor. You can specify an encoding constant for the 
+        character set you want to convert from/to or. If the encoding
+        is not recognized, ISO 8859-1 is used as fall back.
+    */
     wxCSConv(wxFontEncoding encoding);
-    //@}
 
     /**
         Destructor frees any resources needed to perform the conversion.
@@ -193,7 +195,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see @ref overview_mbconvclasses "wxMBConv classes overview"
+    @see @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConvFile : public wxMBConv
 {
@@ -228,8 +230,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see wxMBConvUTF8, wxMBConvUTF16, @ref overview_mbconvclasses "wxMBConv classes
-    overview"
+    @see wxMBConvUTF8, wxMBConvUTF16, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConvUTF32 : public wxMBConv
 {
@@ -267,8 +268,7 @@ public:
     @library{wxbase}
     @category{FIXME}
 
-    @see wxCSConv, wxEncodingConverter, @ref overview_mbconvclasses "wxMBConv
-    classes overview"
+    @see wxCSConv, wxEncodingConverter, @ref overview_mbconv "wxMBConv classes overview"
 */
 class wxMBConv
 {
@@ -330,7 +330,7 @@ public:
             The length of the output buffer but including
             NUL, ignored if out is @NULL
 
-        @returns The length of the converted string excluding the trailing NUL.
+        @return The length of the converted string excluding the trailing NUL.
     */
     virtual size_t MB2WC(wchar_t* out, const char* in,
                          size_t outLen) const;
@@ -386,7 +386,7 @@ public:
         string.
     */
     const wxWCharBuffer cMB2WC(const char* in) const;
-    const const wxWCharBuffer cMB2WC(const char* in,
+    const wxWCharBuffer cMB2WC(const char* in,
                                      size_t inLen,
                                      size_t outLen) const;
     //@}
@@ -400,7 +400,7 @@ public:
         return type (without const).
     */
     const char* cMB2WX(const char* psz) const;
-    const const wxWCharBuffer cMB2WX(const char* psz) const;
+    const wxWCharBuffer cMB2WX(const char* psz) const;
     //@}
 
     //@{
@@ -417,7 +417,7 @@ public:
         string.
     */
     const wxCharBuffer cWC2MB(const wchar_t* in) const;
-    const const wxCharBuffer cWC2MB(const wchar_t* in,
+    const wxCharBuffer cWC2MB(const wchar_t* in,
                                     size_t inLen,
                                     size_t outLen) const;
     //@}
@@ -430,7 +430,7 @@ public:
         return type (without const).
     */
     const wchar_t* cWC2WX(const wchar_t* psz) const;
-    const const wxCharBuffer cWC2WX(const wchar_t* psz) const;
+    const wxCharBuffer cWC2WX(const wchar_t* psz) const;
     //@}
 
     //@{
@@ -441,7 +441,7 @@ public:
         return type (without const).
     */
     const char* cWX2MB(const wxChar* psz) const;
-    const const wxCharBuffer cWX2MB(const wxChar* psz) const;
+    const wxCharBuffer cWX2MB(const wxChar* psz) const;
     //@}
 
     //@{
@@ -452,7 +452,7 @@ public:
         return type (without const).
     */
     const wchar_t* cWX2WC(const wxChar* psz) const;
-    const const wxWCharBuffer cWX2WC(const wxChar* psz) const;
+    const wxWCharBuffer cWX2WC(const wxChar* psz) const;
     //@}
 };