X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47561b0dc572e82f9b01b881a12202b1a8542163..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/string.h?ds=sidebyside diff --git a/include/wx/string.h b/include/wx/string.h index f55ac3032b..d39b0c9188 100644 --- a/include/wx/string.h +++ b/include/wx/string.h @@ -1185,7 +1185,7 @@ public: { return (wxString&)wxStringBase::assign(first, last); } // string comparison -#if !defined(HAVE_STD_STRING_COMPARE) +#if !defined(HAVE_STD_STRING_COMPARE) int compare(const wxStringBase& str) const; // comparison with a substring int compare(size_t nStart, size_t nLen, const wxStringBase& str) const; @@ -1463,12 +1463,6 @@ inline bool operator!=(const wxCharBuffer& s1, const wxString& s2) { return (s2.Cmp((const char *)s1) != 0); } #endif // wxUSE_UNICODE/!wxUSE_UNICODE -wxString WXDLLIMPEXP_BASE operator+(const wxString& string1, const wxString& string2); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, wxChar ch); -wxString WXDLLIMPEXP_BASE operator+(wxChar ch, const wxString& string); -wxString WXDLLIMPEXP_BASE operator+(const wxString& string, const wxChar *psz); -wxString WXDLLIMPEXP_BASE operator+(const wxChar *psz, const wxString& string); - #if wxUSE_UNICODE inline wxString operator+(const wxString& string, const wxWCharBuffer& buf) { return string + (const wchar_t *)buf; }