X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5343e065a0a9bb86aeac8a366ca7311c15e9d29..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/stringimpl.h diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h index 54b7af5919..00d24e2242 100644 --- a/include/wx/stringimpl.h +++ b/include/wx/stringimpl.h @@ -53,7 +53,18 @@ extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; // deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING // ---------------------------------------------------------------------------- -#define wxUSE_STL_BASED_WXSTRING wxUSE_STL +// using STL implies using std::string +#if wxUSE_STL + #undef wxUSE_STD_STRING + #define wxUSE_STD_STRING 1 +#endif + +// we use STL-based string internally if we use std::string at all now, there +// should be no reason to prefer our internal implement but if you really need +// it you can predefine wxUSE_STL_BASED_WXSTRING as 0 when building the library +#ifndef wxUSE_STL_BASED_WXSTRING + #define wxUSE_STL_BASED_WXSTRING wxUSE_STD_STRING +#endif // in both cases we need to define wxStdString #if wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING @@ -247,7 +258,7 @@ public: \ private: \ /* for wxStringImpl use only */ \ - operator pointer() const { return m_ptr; } \ + pointer GetPtr() const { return m_ptr; } \ \ friend class wxStringImpl; \ \ @@ -371,9 +382,11 @@ public: // lib.string.access // return the character at position n + value_type operator[](size_type n) const { return m_pchData[n]; } value_type at(size_type n) const { wxASSERT_VALID_INDEX( n ); return m_pchData[n]; } // returns the writable character at position n + reference operator[](size_type n) { CopyBeforeWrite(); return m_pchData[n]; } reference at(size_type n) { wxASSERT_VALID_INDEX( n ); @@ -401,7 +414,7 @@ public: wxStringImpl& append(size_t n, wxStringCharType ch); // append from first to last wxStringImpl& append(const_iterator first, const_iterator last) - { ConcatSelf(last - first, first); return *this; } + { ConcatSelf(last - first, first.GetPtr()); return *this; } // same as `this_string = str' wxStringImpl& assign(const wxStringImpl& str) @@ -451,7 +464,7 @@ public: 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); } + { insert(it - begin(), first.GetPtr(), last - first); } void insert(iterator it, size_type n, wxStringCharType ch) { insert(it - begin(), n, ch); } @@ -498,7 +511,7 @@ public: { return replace(first - begin(), last - first, n, c); } wxStringImpl& replace(iterator first, iterator last, const_iterator first1, const_iterator last1) - { return replace(first - begin(), last - first, first1, last1 - first1); } + { return replace(first - begin(), last - first, first1.GetPtr(), last1 - first1); } // swap two strings void swap(wxStringImpl& str);