Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added ctor for wxChar/WCharBuffer from wxCStrData in ANSI/Unicode build to make it possible to compile code like "wxCharBuffer buf = s.c_str()" again (in particular, fixes wxGTK1 compilation)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-19 13:18:02 +00:00
parent e229d82e0e
commit 414b7b4016
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/buffer.h
View File

@@ -30,6 +30,8 @@ public: \
{ \ { \
} \ } \
\ \
classname(const wxCStrData& cstr); \
\
classname(size_t len) \ classname(size_t len) \
: m_str((chartype *)malloc((len + 1)*sizeof(chartype))) \ : m_str((chartype *)malloc((len + 1)*sizeof(chartype))) \
{ \ { \

20
include/wx/string.h
View File

@@ -2013,4 +2013,24 @@ inline wxUniChar wxCStrData::operator[](size_t n) const
return m_str->at(m_offset + n); return m_str->at(m_offset + n);
} }
// ----------------------------------------------------------------------------
// implementation of wx[W]CharBuffer inline methods using wxCStrData
// ----------------------------------------------------------------------------
#if wxUSE_UNICODE
inline wxWCharBuffer::wxWCharBuffer(const wxCStrData& cstr)
: m_str(wxStrdupW(cstr))
{
}
#else // !wxUSE_UNICODE
inline wxCharBuffer::wxCharBuffer(const wxCStrData& cstr)
: m_str(wxStrdupA(cstr))
{
}
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
#endif // _WX_WXSTRINGH__ #endif // _WX_WXSTRINGH__