#include "wx/stringops.h"
#include "wx/unichar.h"
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxString;
// unless this symbol is predefined to disable the compatibility functions, do
// use them
size_t m_offset;
bool m_owned;
- friend class WXDLLIMPEXP_BASE wxString;
+ friend class WXDLLIMPEXP_FWD_BASE wxString;
};
// ----------------------------------------------------------------------------
// see the comment near wxString::iterator for why we need this
struct WXDLLIMPEXP_BASE wxStringIteratorNode
{
- inline wxStringIteratorNode(const wxString *str,
- wxStringImpl::const_iterator *citer);
- inline wxStringIteratorNode(const wxString *str,
- wxStringImpl::iterator *iter);
- inline ~wxStringIteratorNode();
+ wxStringIteratorNode()
+ : m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {}
+ wxStringIteratorNode(const wxString *str,
+ wxStringImpl::const_iterator *citer)
+ { DoSet(str, citer, NULL); }
+ wxStringIteratorNode(const wxString *str, wxStringImpl::iterator *iter)
+ { DoSet(str, NULL, iter); }
+ ~wxStringIteratorNode()
+ { clear(); }
+
+ inline void set(const wxString *str, wxStringImpl::const_iterator *citer)
+ { clear(); DoSet(str, citer, NULL); }
+ inline void set(const wxString *str, wxStringImpl::iterator *iter)
+ { clear(); DoSet(str, NULL, iter); }
const wxString *m_str;
wxStringImpl::const_iterator *m_citer;
wxStringImpl::iterator *m_iter;
wxStringIteratorNode *m_prev, *m_next;
+private:
+ inline void clear();
+ inline void DoSet(const wxString *str,
+ wxStringImpl::const_iterator *citer,
+ wxStringImpl::iterator *iter);
+
// the node belongs to a particular iterator instance, it's not copied
// when a copy of the iterator is made
DECLARE_NO_COPY_CLASS(wxStringIteratorNode)
/* for internal wxString use only: */ \
underlying_iterator impl() const { return m_cur; } \
\
- friend class WXDLLIMPEXP_BASE wxString; \
- friend class WXDLLIMPEXP_BASE wxCStrData; \
+ friend class wxString; \
+ friend class wxCStrData; \
\
private: \
underlying_iterator m_cur
- class WXDLLIMPEXP_BASE const_iterator;
+ class WXDLLIMPEXP_FWD_BASE const_iterator;
#if wxUSE_UNICODE_UTF8
// NB: In UTF-8 build, (non-const) iterator needs to keep reference
WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef);
public:
+ iterator() {}
iterator(const iterator& i)
: m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
iterator& operator=(const iterator& i)
- { m_cur = i.m_cur; return *this; }
+ { m_cur = i.m_cur; m_node.set(i.str(), &m_cur); return *this; }
reference operator*()
{ return wxUniCharRef::CreateForString(m_node, m_cur); }
WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar);
public:
+ const_iterator() {}
const_iterator(const const_iterator& i)
: m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
const_iterator(const iterator& i)
: m_cur(i.m_cur), m_node(i.str(), &m_cur) {}
const_iterator& operator=(const const_iterator& i)
- { m_cur = i.m_cur; return *this; }
+ { m_cur = i.m_cur; m_node.set(i.str(), &m_cur); return *this; }
const_iterator& operator=(const iterator& i)
- { m_cur = i.m_cur; return *this; }
+ { m_cur = i.m_cur; m_node.set(i.str(), &m_cur); return *this; }
reference operator*() const
{ return wxStringOperations::DecodeChar(m_cur); }
WX_STR_ITERATOR_IMPL(iterator, wxChar*, wxUniCharRef);
public:
+ iterator() {}
iterator(const iterator& i) : m_cur(i.m_cur) {}
reference operator*()
WX_STR_ITERATOR_IMPL(const_iterator, const wxChar*, wxUniChar);
public:
+ const_iterator() {}
const_iterator(const const_iterator& i) : m_cur(i.m_cur) {}
const_iterator(const iterator& i) : m_cur(i.m_cur) {}
typedef typename T::reference reference;
typedef typename T::pointer *pointer;
+ reverse_iterator_impl() {}
reverse_iterator_impl(iterator_type i) : m_cur(i) {}
reverse_iterator_impl(const reverse_iterator_impl& ri)
: m_cur(ri.m_cur) {}
// implicit conversion to C string
operator wxCStrData() const { return c_str(); }
- // these operators conflict with operators for conversion to std::string,
- // so they must be disabled in STL build:
+ // the first two operators conflict with operators for conversion to
+ // std::string and they must be disabled in STL build; the next one only
+ // makes sense if conversions to char* are also defined and not defining it
+ // in STL build also helps us to get more clear error messages for the code
+ // which relies on implicit conversion to char* in STL build
#if !wxUSE_STL
operator const char*() const { return c_str(); }
operator const wchar_t*() const { return c_str(); }
-#endif
// implicit conversion to untyped pointer for compatibility with previous
// wxWidgets versions: this is the same as conversion to const char * so it
// may fail!
operator const void*() const { return c_str(); }
+#endif // wxUSE_STL
// identical to c_str(), for MFC compatibility
const wxCStrData GetData() const { return c_str(); }
wxStringIteratorNodeHead m_iterators;
- friend class WXDLLIMPEXP_BASE wxStringIteratorNode;
- friend class WXDLLIMPEXP_BASE wxUniCharRef;
+ friend class WXDLLIMPEXP_FWD_BASE wxStringIteratorNode;
+ friend class WXDLLIMPEXP_FWD_BASE wxUniCharRef;
#endif // wxUSE_UNICODE_UTF8
- friend class WXDLLIMPEXP_BASE wxCStrData;
+ friend class WXDLLIMPEXP_FWD_BASE wxCStrData;
friend class wxImplStringBuffer;
friend class wxImplStringBufferLength;
};
inline wxCStrData::~wxCStrData()
{
if ( m_owned )
- delete m_str;
+ delete wx_const_cast(wxString*, m_str); // cast to silence warnings
}
// simple cases for AsChar() and AsWChar(), the complicated ones are
// implementation of wxStringIteratorNode inline methods
// ----------------------------------------------------------------------------
-wxStringIteratorNode::wxStringIteratorNode(const wxString *str,
- wxStringImpl::const_iterator *citer)
- : m_str(str),
- m_citer(citer),
- m_iter(NULL),
- m_prev(NULL),
- m_next(str->m_iterators.ptr)
-{
- wx_const_cast(wxString*, m_str)->m_iterators.ptr = this;
- if ( m_next )
- m_next->m_prev = this;
-}
-
-wxStringIteratorNode::wxStringIteratorNode(const wxString *str,
- wxStringImpl::iterator *iter)
- : m_str(str),
- m_citer(NULL),
- m_iter(iter),
- m_prev(NULL),
- m_next(str->m_iterators.ptr)
+void wxStringIteratorNode::DoSet(const wxString *str,
+ wxStringImpl::const_iterator *citer,
+ wxStringImpl::iterator *iter)
{
- wx_const_cast(wxString*, m_str)->m_iterators.ptr = this;
- if ( m_next)
- m_next->m_prev = this;
+ m_prev = NULL;
+ m_iter = iter;
+ m_citer = citer;
+ m_str = str;
+ if ( str )
+ {
+ m_next = str->m_iterators.ptr;
+ wx_const_cast(wxString*, m_str)->m_iterators.ptr = this;
+ if ( m_next )
+ m_next->m_prev = this;
+ }
+ else
+ {
+ m_next = NULL;
+ }
}
-wxStringIteratorNode::~wxStringIteratorNode()
+void wxStringIteratorNode::clear()
{
if ( m_next )
m_next->m_prev = m_prev;
if ( m_prev )
m_prev->m_next = m_next;
- else // first in the list
+ else if ( m_str ) // first in the list
wx_const_cast(wxString*, m_str)->m_iterators.ptr = m_next;
+
+ m_next = m_prev = NULL;
+ m_citer = NULL;
+ m_iter = NULL;
+ m_str = NULL;
}
#endif // wxUSE_UNICODE_UTF8
projects / wxWidgets.git / blobdiff