Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/encconv.h b/interface/wx/encconv.h
index 857531c6155006779fe7eb0b522ec9b7d701b618..579f4fc1e7fa81a16058adce86aa32724f0c87a0 100644 (file)
--- a/interface/wx/encconv.h
+++ b/interface/wx/encconv.h
@@ -2,8 +2,7 @@
 // Name:        encconv.h
 // Purpose:     interface of wxEncodingConverter
 // Author:      wxWidgets team
 // Name:        encconv.h
 // Purpose:     interface of wxEncodingConverter
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -70,12 +69,23 @@ public:
     bool Convert(const wchar_t* input, char* output) const;
 
     /**
     bool Convert(const wchar_t* input, char* output) const;
 
     /**

-        Convert input string according to settings passed to Init() in-place,
-        i.e. write the result to the same memory area.
+        Convert input string according to settings passed to Init() in-place.
+
+        With this overload, the conversion result is written to the same memory
+        area from which the input is read.

 
         See the Convert(const char*,char*) const overload for more info.
     */
     bool Convert(char* str) const;
 
         See the Convert(const char*,char*) const overload for more info.
     */
     bool Convert(char* str) const;

+
+    /**
+        Convert input string according to settings passed to Init() in-place.
+
+        With this overload, the conversion result is written to the same memory
+        area from which the input is read.
+
+        See the Convert(const wchar_t*,wchar_t*) const overload for more info.
+    */

     bool Convert(wchar_t* str) const;
 
     /**
     bool Convert(wchar_t* str) const;
 
     /**