Removed wxPG_EX_LEGACY_VALIDATORS

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

diff --git a/interface/wx/string.h b/interface/wx/string.h
index be71c0edd0c792c13df08f225166b862c0801c51..dd0c7d7d2e3408623c10948cf65ed5ac6355f926 100644 (file)
--- a/interface/wx/string.h
+++ b/interface/wx/string.h
@@ -98,7 +98,7 @@ public:
     wxString implements caching of the last used index so that iterating over
     a string is a linear operation even in UTF-8 mode.
     
     wxString implements caching of the last used index so that iterating over
     a string is a linear operation even in UTF-8 mode.
     

-    It is nonetheless recommended to use iterators (instead of index bases
+    It is nonetheless recommended to use iterators (instead of index based

     access) like this:
 
     @code
     access) like this:
 
     @code


@@ -459,7 +459,7 @@ public:
     /**
        Appends the string literal @e psz with max length @e nLen.
     */
     /**
        Appends the string literal @e psz with max length @e nLen.
     */

-    wxString& Append(const char* psz, size_t nLen);
+    wxString& Append(const wchar_t* pwz);

 
     /**
        Appends the wide string literal @e psz with max length @e nLen.
 
     /**
        Appends the wide string literal @e psz with max length @e nLen.


@@ -469,7 +469,7 @@ public:
     /**
        Appends the string @e s.
     */
     /**
        Appends the string @e s.
     */

-    wxString &Append(const wxString &s);
+    wxString& Append(const wchar_t* pwz, size_t nLen);

 
     /**
        Appends the character @e ch @e count times.
 
     /**
        Appends the character @e ch @e count times.


@@ -818,14 +818,16 @@ public:
     wxString& MakeCapitalized();
 
     /**
     wxString& MakeCapitalized();
 
     /**

-        Converts all characters to lower case and returns the result.
+        Converts all characters to lower case and returns the reference to the
+        modified string.

 
         @see Lower()
     */
     wxString& MakeLower();
 
     /**
 
         @see Lower()
     */
     wxString& MakeLower();
 
     /**

-        Converts all characters to upper case and returns the result.
+        Converts all characters to upper case and returns the reference to the
+        modified string.

 
         @see Upper()
     */
 
         @see Upper()
     */


@@ -1165,14 +1167,14 @@ public:
     wxString& operator<<(const char* psz)
     wxString& operator<<(const wchar_t* pwz)
     wxString& operator<<(const wxCStrData& psz)
     wxString& operator<<(const char* psz)
     wxString& operator<<(const wchar_t* pwz)
     wxString& operator<<(const wxCStrData& psz)

-    wxString& operator<<(wxUniChar ch);
+    wxString& operator<<(const char* psz);

     wxString& operator<<(wxUniCharRef ch)
     wxString& operator<<(char ch)
     wxString& operator<<(unsigned char ch)
     wxString& operator<<(wchar_t ch)
     wxString& operator<<(const wxCharBuffer& s)
     wxString& operator<<(const wxWCharBuffer& s)
     wxString& operator<<(wxUniCharRef ch)
     wxString& operator<<(char ch)
     wxString& operator<<(unsigned char ch)
     wxString& operator<<(wchar_t ch)
     wxString& operator<<(const wxCharBuffer& s)
     wxString& operator<<(const wxWCharBuffer& s)

-    wxString& operator<<(int i);
+    wxString& operator<<(wxUniCharRef ch);

     wxString& operator<<(unsigned int ui);
     wxString& operator<<(long l);
     wxString& operator<<(unsigned long ul);
     wxString& operator<<(unsigned int ui);
     wxString& operator<<(long l);
     wxString& operator<<(unsigned long ul);