X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57bf907d8e45ced18486d74c04f41c06034b7e65..232b2162776e08c0b16d5280b90f5c075f38c667:/interface/wx/string.h?ds=sidebyside diff --git a/interface/wx/string.h b/interface/wx/string.h index b42f6b8edd..80f58699d1 100644 --- a/interface/wx/string.h +++ b/interface/wx/string.h @@ -539,7 +539,7 @@ public: @see FormatV(), Printf() */ - static wxString Format(const wxChar format, ...); + static wxString Format(const wxString& format, ...); /** This static function returns the string containing the result of calling @@ -547,7 +547,7 @@ public: @see Format(), PrintfV() */ - static wxString FormatV(const wxChar format, va_list argptr); + static wxString FormatV(const wxString& format, va_list argptr); /** Returns the number of occurrences of @e ch in the string. @@ -1139,7 +1139,7 @@ public: //@{ /** Assignment: the effect of each operation is the same as for the corresponding - constructor (see @ref wxString() "wxString constructors"). + constructor (see wxString constructors). */ wxString operator =(const wxString& str); wxString operator =(wxUniChar c); @@ -1369,10 +1369,6 @@ inline bool operator==(const wxString& s1, const wxCharBuffer& s2); inline bool operator==(const wxCharBuffer& s1, const wxString& s2); inline bool operator!=(const wxString& s1, const wxCharBuffer& s2); inline bool operator!=(const wxCharBuffer& s1, const wxString& s2); -inline wxString operator+(const wxString& string, const wxWCharBuffer& buf) -inline wxString operator+(const wxWCharBuffer& buf, const wxString& string) -inline wxString operator+(const wxString& string, const wxCharBuffer& buf) -inline wxString operator+(const wxCharBuffer& buf, const wxString& string) /** Comparison operators with wxUniChar or wxUniCharRef.