Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / encconv.h

diff --git a/interface/wx/encconv.h b/interface/wx/encconv.h
index 6aa6b71c3323a43bc161b27253ab0945ecbd365f..4f65d141ed8aa3cf5da6b05e5717b0c5d034d005 100644 (file)
--- a/interface/wx/encconv.h
+++ b/interface/wx/encconv.h
@@ -3,29 +3,27 @@
 // Purpose:     interface of wxEncodingConverter
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxEncodingConverter
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxEncodingConverter
 
     This class is capable of converting strings between two 8-bit encodings/charsets.
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxEncodingConverter
 
     This class is capable of converting strings between two 8-bit encodings/charsets.

-    It can also convert from/to Unicode (but only if you compiled wxWidgets
-    with wxUSE_WCHAR_T set to 1).
+    It can also convert from/to Unicode.

 
     Only a limited subset of encodings is supported by wxEncodingConverter:
     @c wxFONTENCODING_ISO8859_1..15, @c wxFONTENCODING_CP1250..1257 and
     @c wxFONTENCODING_KOI8.
 
     @note
 
     Only a limited subset of encodings is supported by wxEncodingConverter:
     @c wxFONTENCODING_ISO8859_1..15, @c wxFONTENCODING_CP1250..1257 and
     @c wxFONTENCODING_KOI8.
 
     @note

-

     Please use wxMBConv classes instead if possible. wxCSConv has much better
     support for various encodings than wxEncodingConverter.
     wxEncodingConverter is useful only if you rely on wxCONVERT_SUBSTITUTE mode
     of operation (see wxEncodingConverter::Init()).
 
     @library{wxbase}
     Please use wxMBConv classes instead if possible. wxCSConv has much better
     support for various encodings than wxEncodingConverter.
     wxEncodingConverter is useful only if you rely on wxCONVERT_SUBSTITUTE mode
     of operation (see wxEncodingConverter::Init()).
 
     @library{wxbase}

-    @category{misc}
+    @category{conv}

 
     @see wxFontMapper, wxMBConv, @ref overview_nonenglish
 */
 
     @see wxFontMapper, wxMBConv, @ref overview_nonenglish
 */


@@ -65,9 +63,6 @@ public:
         considered a lossless operation.
 
         @note You must call Init() before using this method!
         considered a lossless operation.
 
         @note You must call Init() before using this method!

-
-        @note wchar_t versions of the method are not available if wxWidgets was
-              compiled with @c wxUSE_WCHAR_T set to 0.

     */
     bool Convert(const char* input, char* output) const;
     bool Convert(const wchar_t* input, wchar_t* output) const;
     */
     bool Convert(const char* input, char* output) const;
     bool Convert(const wchar_t* input, wchar_t* output) const;