projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add wxUSE_BASE64 checks around DoRead/WriteBinary() functions
[wxWidgets.git]
/
include
/
wx
/
stringimpl.h
diff --git
a/include/wx/stringimpl.h
b/include/wx/stringimpl.h
index be477a3275a6ec86e9bc2471b400105369d50a6c..c7029974c963f006582e05944bd8702e350aab3f 100644
(file)
--- a/
include/wx/stringimpl.h
+++ b/
include/wx/stringimpl.h
@@
-23,7
+23,8
@@
// ----------------------------------------------------------------------------
#include "wx/defs.h" // everybody should include this
// ----------------------------------------------------------------------------
#include "wx/defs.h" // everybody should include this
-#include "wx/wxchar.h" // for wxChar, wxStrlen() etc.
+#include "wx/chartype.h" // for wxChar
+#include "wx/wxcrtbase.h" // for wxStrlen() etc.
#include <stdlib.h>
#include <stdlib.h>
@@
-42,6
+43,10
@@
// global pointer to empty string
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
// 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
+62,20
@@
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString;
#include <string>
#include "wx/afterstd.h"
#include <string>
#include "wx/afterstd.h"
+#ifdef HAVE_STD_WSTRING
+ typedef std::wstring wxStdWideString;
+#else
+ typedef std::basic_string<wchar_t> wxStdWideString;
+#endif
+
#if wxUSE_UNICODE_WCHAR
#if wxUSE_UNICODE_WCHAR
- #ifdef HAVE_STD_WSTRING
- typedef std::wstring wxStdString;
- #else
- typedef std::basic_string<wxChar> wxStdString;
- #endif
+ typedef wxStdWideString wxStdString;
#else
typedef std::string wxStdString;
#endif
#else
typedef std::string wxStdString;
#endif
-#endif // need <string>
+#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING
+
#if wxUSE_STL_BASED_WXSTRING
#if wxUSE_STL_BASED_WXSTRING
@@
-97,8
+105,8
@@
struct WXDLLIMPEXP_BASE wxStringData
size_t nDataLength, // actual string length
nAllocLength; // allocated memory size
size_t nDataLength, // actual string length
nAllocLength; // allocated memory size
- // mimics declaration 'wx
Char
data[nAllocLength]'
- wx
Char* data() const { return (wxChar
*)(this + 1); }
+ // mimics declaration 'wx
StringCharType
data[nAllocLength]'
+ wx
StringCharType* data() const { return (wxStringCharType
*)(this + 1); }
// empty string has a special ref count so it's never deleted
bool IsEmpty() const { return (nRefs == -1); }
// empty string has a special ref count so it's never deleted
bool IsEmpty() const { return (nRefs == -1); }
@@
-143,7
+151,11
@@
protected:
// string (re)initialization functions
// initializes the string to the empty value (must be called only from
// ctors, use Reinit() otherwise)
// 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; }
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
// 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,7
+196,9
@@
public:
typedef wxStringCharType value_type; \
typedef ref_type reference; \
typedef ptr_type pointer; \
typedef wxStringCharType value_type; \
typedef ref_type reference; \
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; } \
iterator_name(pointer ptr) : m_ptr(ptr) { } \
\
reference operator*() const { return *m_ptr; } \
@@
-207,14
+221,22
@@
public:
\
iterator_name operator+(int 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) 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+=(int n) \
{ m_ptr += n; return *this; } \
+ iterator_name& operator+=(size_t n) \
+ { m_ptr += n; return *this; } \
iterator_name& operator-=(int n) \
iterator_name& operator-=(int n) \
+ { m_ptr -= n; return *this; } \
+ iterator_name& operator-=(size_t n) \
{ m_ptr -= n; return *this; } \
\
{ 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 \
{ return m_ptr - i.m_ptr; } \
\
bool operator==(const iterator_name& i) const \
@@
-235,11
+257,16
@@
public:
/* for wxStringImpl use only */ \
operator pointer() const { return m_ptr; } \
\
/* for wxStringImpl use only */ \
operator pointer() const { return m_ptr; } \
\
- friend class
WXDLLIMPEXP_BASE wxStringImpl;
\
+ friend class
wxStringImpl;
\
\
pointer m_ptr
\
pointer m_ptr
- class iterator
+ // 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 WXDLLIMPEXP_FWD_BASE const_iterator;
+
+ class WXDLLIMPEXP_BASE iterator
{
WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
wxStringCharType&,
{
WX_DEFINE_STRINGIMPL_ITERATOR(iterator,
wxStringCharType&,
@@
-248,7
+275,7
@@
public:
friend class const_iterator;
};
friend class const_iterator;
};
- class const_iterator
+ class
WXDLLIMPEXP_BASE
const_iterator
{
public:
const_iterator(iterator i) : m_ptr(i.m_ptr) { }
{
public:
const_iterator(iterator i) : m_ptr(i.m_ptr) { }
@@
-258,6
+285,8
@@
public:
const wxStringCharType*);
};
const wxStringCharType*);
};
+ #undef WX_DEFINE_STRINGIMPL_ITERATOR
+
// constructors and destructor
// ctor for an empty string
// constructors and destructor
// ctor for an empty string
@@
-297,6
+326,17
@@
public:
// take everything between start and end
wxStringImpl(const_iterator start, const_iterator end);
// 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()
{
// dtor is not virtual, this class must not be inherited from!
~wxStringImpl()
{
@@
-414,9
+454,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
// 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)); }
{ 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); }
{ 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); }
@@
-502,14
+542,12
@@
public:
// string += char
wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); }
// string += char
wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); }
-#if !wxUSE_UNICODE_UTF8
// helpers for wxStringBuffer and wxStringBufferLength
wxStringCharType *DoGetWriteBuf(size_t nLen);
void DoUngetWriteBuf();
void DoUngetWriteBuf(size_t nLen);
// helpers for wxStringBuffer and wxStringBufferLength
wxStringCharType *DoGetWriteBuf(size_t nLen);
void DoUngetWriteBuf();
void DoUngetWriteBuf(size_t nLen);
-#endif
- friend class WXDLLIMPEXP_BASE wxString;
+ friend class WXDLLIMPEXP_
FWD_
BASE wxString;
};
#endif // !wxUSE_STL_BASED_WXSTRING
};
#endif // !wxUSE_STL_BASED_WXSTRING