X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/467175ab3f2177aa824ceb7b67934fd54ce4e8e0..564ab31a536c90ff37fc5a4d4ffc09b55c7bdb96:/include/wx/stringops.h diff --git a/include/wx/stringops.h b/include/wx/stringops.h index 6451275bb1..ed53532d9e 100644 --- a/include/wx/stringops.h +++ b/include/wx/stringops.h @@ -15,6 +15,7 @@ #include "wx/chartype.h" #include "wx/stringimpl.h" #include "wx/unichar.h" +#include "wx/buffer.h" // This header contains wxStringOperations "namespace" class that implements // elementary operations on string data as static methods; wxString methods and @@ -39,6 +40,8 @@ struct WXDLLIMPEXP_BASE wxStringOperationsWchar { return i + n; } static wxStringImpl::const_iterator AddToIter(const wxStringImpl::const_iterator& i, int n) { return i + n; } + static const wxChar* AddToIter(const wxChar *i, int n) + { return i + n; } // returns distance of the two iterators in Unicode characters static int DiffIters(const wxStringImpl::iterator& i1, @@ -62,7 +65,8 @@ struct WXDLLIMPEXP_BASE wxStringOperationsWchar struct WXDLLIMPEXP_BASE wxStringOperationsUtf8 { // checks correctness of UTF-8 sequence - static bool IsValidUtf8String(const char *c); + static bool IsValidUtf8String(const char *c, + size_t len = wxStringImpl::npos); #ifdef __WXDEBUG__ static bool IsValidUtf8LeadByte(unsigned char c); #endif