X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c2b62db9173af22dc81aad5e26cbcbc4f2a6645..55bfbcb92b41ab1c6a0d490f2f3fcadefc069bb7:/include/wx/stringimpl.h diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h index d81185344b..1b3f172c94 100644 --- a/include/wx/stringimpl.h +++ b/include/wx/stringimpl.h @@ -42,6 +42,10 @@ // global pointer to empty string extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString; +#if wxUSE_UNICODE_UTF8 +// FIXME-UTF8: we should have only one wxEmptyString +extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; +#endif // ---------------------------------------------------------------------------- @@ -57,17 +61,20 @@ extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString; #include #include "wx/afterstd.h" +#ifdef HAVE_STD_WSTRING + typedef std::wstring wxStdWideString; +#else + typedef std::basic_string wxStdWideString; +#endif + #if wxUSE_UNICODE_WCHAR - #ifdef HAVE_STD_WSTRING - typedef std::wstring wxStdString; - #else - typedef std::basic_string wxStdString; - #endif + typedef wxStdWideString wxStdString; #else typedef std::string wxStdString; #endif -#endif // need +#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING + #if wxUSE_STL_BASED_WXSTRING @@ -97,8 +104,8 @@ struct WXDLLIMPEXP_BASE wxStringData size_t nDataLength, // actual string length nAllocLength; // allocated memory size - // mimics declaration 'wxChar data[nAllocLength]' - wxChar* data() const { return (wxChar*)(this + 1); } + // mimics declaration 'wxStringCharType data[nAllocLength]' + wxStringCharType* data() const { return (wxStringCharType*)(this + 1); } // empty string has a special ref count so it's never deleted bool IsEmpty() const { return (nRefs == -1); } @@ -143,7 +150,11 @@ protected: // string (re)initialization functions // initializes the string to the empty value (must be called only from // ctors, use Reinit() otherwise) +#if wxUSE_UNICODE_UTF8 + void Init() { m_pchData = (wxStringCharType *)wxEmptyStringImpl; } // FIXME-UTF8 +#else void Init() { m_pchData = (wxStringCharType *)wxEmptyString; } +#endif // initializes the string with (a part of) C-string void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos); // as Init, but also frees old data @@ -184,6 +195,7 @@ public: typedef wxStringCharType value_type; \ typedef ref_type reference; \ typedef ptr_type pointer; \ + typedef int difference_type; \ \ iterator_name(pointer ptr) : m_ptr(ptr) { } \ \ @@ -207,14 +219,22 @@ public: \ iterator_name operator+(int n) const \ { return iterator_name(m_ptr + n); } \ + iterator_name operator+(size_t n) const \ + { return iterator_name(m_ptr + n); } \ iterator_name operator-(int n) const \ { return iterator_name(m_ptr - n); } \ + iterator_name operator-(size_t n) const \ + { return iterator_name(m_ptr - n); } \ iterator_name& operator+=(int n) \ { m_ptr += n; return *this; } \ + iterator_name& operator+=(size_t n) \ + { m_ptr += n; return *this; } \ iterator_name& operator-=(int n) \ + { m_ptr -= n; return *this; } \ + iterator_name& operator-=(size_t n) \ { m_ptr -= n; return *this; } \ \ - size_t operator-(const iterator_name& i) const \ + difference_type operator-(const iterator_name& i) const \ { return m_ptr - i.m_ptr; } \ \ bool operator==(const iterator_name& i) const \ @@ -263,6 +283,8 @@ public: const wxStringCharType*); }; + #undef WX_DEFINE_STRINGIMPL_ITERATOR + // constructors and destructor // ctor for an empty string @@ -302,6 +324,17 @@ public: // take everything between start and end wxStringImpl(const_iterator start, const_iterator end); + + // ctor from and conversion to std::string +#if wxUSE_STD_STRING + wxStringImpl(const wxStdString& impl) + { InitWith(impl.c_str(), 0, impl.length()); } + + operator wxStdString() const + { return wxStdString(c_str(), length()); } +#endif + + // dtor is not virtual, this class must not be inherited from! ~wxStringImpl() { @@ -367,7 +400,7 @@ public: { ConcatSelf(str.length(), str.c_str()); return *this; } // append first n (or all if n == npos) characters of sz wxStringImpl& append(const wxStringCharType *sz) - { ConcatSelf(wxStrlen(sz), sz); return *this; } + { ConcatSelf(Strsize(sz), sz); return *this; } wxStringImpl& append(const wxStringCharType *sz, size_t n) { ConcatSelf(n, sz); return *this; } // append n copies of ch @@ -384,7 +417,7 @@ public: { clear(); return append(str, pos, n); } // same as `= first n (or all if n == npos) characters of sz' wxStringImpl& assign(const wxStringCharType *sz) - { clear(); return append(sz, wxStrlen(sz)); } + { clear(); return append(sz, Strsize(sz)); } wxStringImpl& assign(const wxStringCharType *sz, size_t n) { clear(); return append(sz, n); } // same as `= n copies of ch' @@ -419,9 +452,9 @@ public: // insert first n (or all if n == npos) characters of sz wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos); // insert n copies of ch - wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch)// FIXME-UTF8: tricky + wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch) { return insert(nPos, wxStringImpl(n, ch)); } - iterator insert(iterator it, wxStringCharType ch) // FIXME-UTF8: tricky + iterator insert(iterator it, wxStringCharType ch) { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; } void insert(iterator it, const_iterator first, const_iterator last) { insert(it - begin(), first, last - first); } @@ -514,6 +547,13 @@ public: void DoUngetWriteBuf(size_t nLen); #endif +private: +#if wxUSE_UNICODE_UTF8 + static size_t Strsize(const wxStringCharType *s) { return strlen(s); } +#else + static size_t Strsize(const wxStringCharType *s) { return wxStrlen(s); } +#endif + friend class WXDLLIMPEXP_BASE wxString; };