Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/ustring.h b/interface/wx/ustring.h
index c42b7db65ea3c572f599ff859351e55c0431a0ac..8f9d59162ce1b3c74984949aaf3aa7aacbc49b26 100644 (file)
--- a/interface/wx/ustring.h
+++ b/interface/wx/ustring.h
@@ -3,7 +3,6 @@
 // Purpose:     interface of wxUString
 // Author:      Robert Roebling
 // Copyright:   (c) Robert Roebling
 // Purpose:     interface of wxUString
 // Author:      Robert Roebling
 // Copyright:   (c) Robert Roebling

-// RCS-ID:      $Id: tab.h 37400 2006-02-09 00:28:34Z VZ $

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,7 +13,7 @@
     each character is stored using a 32-bit value. This is different from
     wxString which may store a character either as a UTF-8 or as a UTF-16
     sequence and different from @c std::string which stores a string
     each character is stored using a 32-bit value. This is different from
     wxString which may store a character either as a UTF-8 or as a UTF-16
     sequence and different from @c std::string which stores a string

-    as a squence of simple 8-bit charactesr and also different from
+    as a sequence of simple 8-bit characters and also different from

     @c std::wstring which stores the string differently depending on
     the definition of wchar_t.
 
     @c std::wstring which stores the string differently depending on
     the definition of wchar_t.
 


@@ -151,35 +150,35 @@ public:
 
 
     /**
 
 
     /**

-       Assigment from a 7-bit ASCII string literal
+       Assignment from a 7-bit ASCII string literal

     */
     wxUString &assignFromAscii( const char *str );
     /**
     */
     wxUString &assignFromAscii( const char *str );
     /**

-       Assigment from a 7-bit ASCII string literal
+       Assignment from a 7-bit ASCII string literal

     */
     wxUString &assignFromAscii( const char *str, size_t n );
     /**
     */
     wxUString &assignFromAscii( const char *str, size_t n );
     /**

-       Assigment from a UTF-8 string literal
+       Assignment from a UTF-8 string literal

     */
     wxUString &assignFromUTF8( const char *str );
     /**
     */
     wxUString &assignFromUTF8( const char *str );
     /**

-       Assigment from a UTF-8 string literal
+       Assignment from a UTF-8 string literal

     */
     wxUString &assignFromUTF8( const char *str, size_t n );
     /**
     */
     wxUString &assignFromUTF8( const char *str, size_t n );
     /**

-       Assigment from a UTF-16 string literal
+       Assignment from a UTF-16 string literal

     */
     wxUString &assignFromUTF16( const wxChar16* str );
     /**
     */
     wxUString &assignFromUTF16( const wxChar16* str );
     /**

-       Assigment from a UTF-16 string literal
+       Assignment from a UTF-16 string literal

     */
     wxUString &assignFromUTF16( const wxChar16* str, size_t n );
     /**
     */
     wxUString &assignFromUTF16( const wxChar16* str, size_t n );
     /**

-       Assigment from a C string literal using wxConvLibc
+       Assignment from a C string literal using wxConvLibc

     */
     wxUString &assignFromCString( const char* str );
     /**
     */
     wxUString &assignFromCString( const char* str );
     /**

-       Assigment from a C string literal using @a conv
+       Assignment from a C string literal using @a conv

     */
     wxUString &assignFromCString( const char* str, const wxMBConv &conv );
 
     */
     wxUString &assignFromCString( const char* str, const wxMBConv &conv );