AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use class keyword to match forward decl, call static members directly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2007-10-26 06:19:27 +00:00
parent 65a4323236
commit 326a863afc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/string.h
View File

@ -380,8 +380,9 @@ protected:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
// see the comment near wxString::iterator for why we need this // see the comment near wxString::iterator for why we need this
struct WXDLLIMPEXP_BASE wxStringIteratorNode class WXDLLIMPEXP_BASE wxStringIteratorNode
{ {
public:
wxStringIteratorNode() wxStringIteratorNode()
: m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {} : m_str(NULL), m_citer(NULL), m_iter(NULL), m_prev(NULL), m_next(NULL) {}
wxStringIteratorNode(const wxString *str, wxStringIteratorNode(const wxString *str,
@ -1875,7 +1876,7 @@ public:
wxString& append(const wxString& str, size_t pos, size_t n) wxString& append(const wxString& str, size_t pos, size_t n)
{ {
size_t from, len; size_t from, len;
str.PosLenToImpl(pos, n, &from, &len); PosLenToImpl(pos, n, &from, &len);
m_impl.append(str.m_impl, from, len); m_impl.append(str.m_impl, from, len);
return *this; return *this;
} }
@ -1942,7 +1943,7 @@ public:
wxString& assign(const wxString& str, size_t pos, size_t n) wxString& assign(const wxString& str, size_t pos, size_t n)
{ {
size_t from, len; size_t from, len;
str.PosLenToImpl(pos, n, &from, &len); PosLenToImpl(pos, n, &from, &len);
m_impl.assign(str.m_impl, from, len); m_impl.assign(str.m_impl, from, len);
return *this; return *this;
} }
@ -2038,7 +2039,7 @@ public:
wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n) wxString& insert(size_t nPos, const wxString& str, size_t nStart, size_t n)
{ {
size_t from, len; size_t from, len;
str.PosLenToImpl(nStart, n, &from, &len); PosLenToImpl(nStart, n, &from, &len);
m_impl.insert(PosToImpl(nPos), str.m_impl, from, len); m_impl.insert(PosToImpl(nPos), str.m_impl, from, len);
return *this; return *this;
} }
@ -2168,7 +2169,7 @@ public:
PosLenToImpl(nStart, nLen, &from, &len); PosLenToImpl(nStart, nLen, &from, &len);
size_t from2, len2; size_t from2, len2;
str.PosLenToImpl(nStart2, nLen2, &from2, &len2); PosLenToImpl(nStart2, nLen2, &from2, &len2);
m_impl.replace(from, len, str.m_impl, from2, len2); m_impl.replace(from, len, str.m_impl, from2, len2);
return *this; return *this;