#include "wx/defs.h" // everybody should include this
#include "wx/chartype.h" // for wxChar
-#include "wx/wxcrt.h" // for wxStrlen() etc.
+#include "wx/wxcrtbase.h" // for wxStrlen() etc.
#include <stdlib.h>
// 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
typedef ptr_type pointer; \
typedef int difference_type; \
\
+ iterator_name() : m_ptr(NULL) { } \
iterator_name(pointer ptr) : m_ptr(ptr) { } \
\
reference operator*() const { return *m_ptr; } \
return tmp; \
} \
\
- iterator_name operator+(int n) const \
- { return iterator_name(m_ptr + n); } \
- iterator_name operator+(size_t n) const \
+ iterator_name operator+(ptrdiff_t n) const \
{ return iterator_name(m_ptr + n); } \
- iterator_name operator-(int n) const \
+ iterator_name operator-(ptrdiff_t 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) \
+ iterator_name& operator+=(ptrdiff_t n) \
{ m_ptr += n; return *this; } \
- iterator_name& operator-=(int n) \
- { m_ptr -= n; return *this; } \
- iterator_name& operator-=(size_t n) \
+ iterator_name& operator-=(ptrdiff_t n) \
{ m_ptr -= n; return *this; } \
\
difference_type operator-(const iterator_name& i) const \
\
private: \
/* for wxStringImpl use only */ \
- operator pointer() const { return m_ptr; } \
+ pointer GetPtr() const { return m_ptr; } \
\
- friend class WXDLLIMPEXP_BASE wxStringImpl; \
+ friend class wxStringImpl; \
\
pointer m_ptr
// we need to declare const_iterator in wxStringImpl scope, the friend
// declaration inside iterator class itself is not enough, or at least not
// for g++ 3.4 (g++ 4 is ok)
- class const_iterator;
+ class WXDLLIMPEXP_FWD_BASE const_iterator;
- class iterator
+ class WXDLLIMPEXP_BASE iterator
{
WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
wxStringCharType&,
friend class const_iterator;
};
- class const_iterator
+ class WXDLLIMPEXP_BASE const_iterator
{
public:
const_iterator(iterator i) : m_ptr(i.m_ptr) { }
{ 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(Strsize(sz), sz); return *this; }
+ { ConcatSelf(wxStrlen(sz), sz); return *this; }
wxStringImpl& append(const wxStringCharType *sz, size_t n)
{ ConcatSelf(n, sz); return *this; }
// append n copies of ch
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)
{ return *this = str; }
// same as ` = str[pos..pos + n]
wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n)
- { clear(); return append(str, pos, n); }
+ { return replace(0, npos, str, pos, n); }
// same as `= first n (or all if n == npos) characters of sz'
wxStringImpl& assign(const wxStringCharType *sz)
- { clear(); return append(sz, Strsize(sz)); }
+ { return replace(0, npos, sz, wxStrlen(sz)); }
wxStringImpl& assign(const wxStringCharType *sz, size_t n)
- { clear(); return append(sz, n); }
+ { return replace(0, npos, sz, n); }
// same as `= n copies of ch'
wxStringImpl& assign(size_t n, wxStringCharType ch)
- { clear(); return append(n, ch); }
+ { return replace(0, npos, n, ch); }
// assign from first to last
wxStringImpl& assign(const_iterator first, const_iterator last)
- { clear(); return append(first, last); }
+ { return replace(begin(), end(), first, last); }
// first valid index position
const_iterator begin() const { return m_pchData; }
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); }
const wxStringCharType* data() const { return m_pchData; }
// replaces the substring of length nLen starting at nStart
- wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz);
+ wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz)
+ { return replace(nStart, nLen, sz, npos); }
// replaces the substring of length nLen starting at nStart
wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str)
- { return replace(nStart, nLen, str.c_str()); }
+ { return replace(nStart, nLen, str.c_str(), str.length()); }
// replaces the substring with nCount copies of ch
- wxStringImpl& replace(size_t nStart, size_t nLen, size_t nCount, wxStringCharType ch);
+ wxStringImpl& replace(size_t nStart, size_t nLen,
+ size_t nCount, wxStringCharType ch)
+ { return replace(nStart, nLen, wxStringImpl(nCount, ch)); }
// replaces a substring with another substring
wxStringImpl& replace(size_t nStart, size_t nLen,
- const wxStringImpl& str, size_t nStart2, size_t nLen2);
+ const wxStringImpl& str, size_t nStart2, size_t nLen2)
+ { return replace(nStart, nLen, str.substr(nStart2, nLen2)); }
// replaces the substring with first nCount chars of sz
wxStringImpl& replace(size_t nStart, size_t nLen,
const wxStringCharType* sz, size_t nCount);
+
wxStringImpl& replace(iterator first, iterator last, const_pointer s)
{ return replace(first - begin(), last - first, s); }
wxStringImpl& replace(iterator first, iterator last, const_pointer s,
{ 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);
void DoUngetWriteBuf();
void DoUngetWriteBuf(size_t nLen);
-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;
+ friend class WXDLLIMPEXP_FWD_BASE wxString;
};
#endif // !wxUSE_STL_BASED_WXSTRING
projects / wxWidgets.git / blobdiff