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

deprecated wxString::GetWriteBuf() and friends in favour of wxStringBuffer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-03-07 20:01:52 +00:00
parent 24ad931818
commit d8a4b666cf
3 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/string.cpp
View File

@@ -1061,7 +1061,7 @@ bool wxString::Shrink()
#if !wxUSE_STL
// get the pointer to writable buffer of (at least) nLen bytes
wxChar *wxString::GetWriteBuf(size_t nLen)
wxChar *wxString::DoGetWriteBuf(size_t nLen)
{
if ( !AllocBeforeWrite(nLen) ) {
// allocation failure handled by caller
@@ -1075,12 +1075,12 @@ wxChar *wxString::GetWriteBuf(size_t nLen)
}
// put string back in a reasonable state after GetWriteBuf
void wxString::UngetWriteBuf()
void wxString::DoUngetWriteBuf()
{
UngetWriteBuf(wxStrlen(m_pchData));
DoUngetWriteBuf(wxStrlen(m_pchData));
}
void wxString::UngetWriteBuf(size_t nLen)
void wxString::DoUngetWriteBuf(size_t nLen)
{
wxStringData * const pData = GetStringData();
@@ -1091,8 +1091,28 @@ void wxString::UngetWriteBuf(size_t nLen)
pData->nDataLength = nLen;
pData->Validate(true);
}
// deprecated compatibility code:
#if WXWIN_COMPATIBILITY_2_8
wxChar *wxString::GetWriteBuf(size_t nLen)
{
return DoGetWriteBuf(nLen);
}
void wxString::UngetWriteBuf()
{
DoUngetWriteBuf();
}
void wxString::UngetWriteBuf(size_t nLen)
{
DoUngetWriteBuf(nLen);
}
#endif // WXWIN_COMPATIBILITY_2_8
#endif // !wxUSE_STL
// ---------------------------------------------------------------------------
// data access
// ---------------------------------------------------------------------------