fix wxMSW build after wxBrush changes: return wxBRUSHSTYLE_MAX instead of zero; fix...

[wxWidgets.git] / interface / encconv.h

diff --git a/interface/encconv.h b/interface/encconv.h
index 46ada4c2d193a0cb2dbb8b0f0390476071c9652e..b72f8478178b5d41d803fc17bb8e0f4b8958d210 100644 (file)
--- a/interface/encconv.h
+++ b/interface/encconv.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        encconv.h
-// Purpose:     documentation for wxEncodingConverter class
+// Purpose:     interface of wxEncodingConverter
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
@@ -20,9 +20,8 @@
     @library{wxbase}
     @category{misc}
 
-    @seealso
-    wxFontMapper, wxMBConv, @ref overview_nonenglishoverview "Writing non-English
-    applications"
+    @see wxFontMapper, wxMBConv, @ref overview_nonenglishoverview "Writing
+    non-English applications"
 */
 class wxEncodingConverter : public wxObject
 {
@@ -46,13 +45,13 @@ public:
     /**
         Convert wxString and return new wxString object.
     */
-    bool Convert(const char* input, char* output);
-    bool Convert(const wchar_t* input, wchar_t* output);
-    bool Convert(const char* input, wchar_t* output);
-    bool Convert(const wchar_t* input, char* output);
-    bool Convert(char* str);
-    bool Convert(wchar_t* str);
-    wxString Convert(const wxString& input);
+    bool Convert(const char* input, char* output) const;
+    const bool Convert(const wchar_t* input, wchar_t* output) const;
+    const bool Convert(const char* input, wchar_t* output) const;
+    const bool Convert(const wchar_t* input, char* output) const;
+    const bool Convert(char* str) const;
+    const bool Convert(wchar_t* str) const;
+    const wxString  Convert(const wxString& input) const;
     //@}
 
     /**
@@ -120,3 +119,4 @@ public:
     bool Init(wxFontEncoding input_enc, wxFontEncoding output_enc,
               int method = wxCONVERT_STRICT);
 };
+