Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/ustring.h b/interface/wx/ustring.h
index df974ee125b6b08507bcd231630afbd8b4ceca33..062d32a7856ac19cf055f8a60fc12f0c1d1222ae 100644 (file)
--- a/interface/wx/ustring.h
+++ b/interface/wx/ustring.h
@@ -14,7 +14,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
-    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.
 
@@ -151,35 +151,35 @@ public:
 
 
     /**
-       Assigment from a 7-bit ASCII string literal
+       Assignment from a 7-bit ASCII string literal
     */
     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 );
     /**
-       Assigment from a UTF-8 string literal
+       Assignment from a UTF-8 string literal
     */
     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 );
     /**
-       Assigment from a UTF-16 string literal
+       Assignment from a UTF-16 string literal
     */
     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 );
     /**
-       Assigment from a C string literal using wxConvLibc
+       Assignment from a C string literal using wxConvLibc
     */
     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 );