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

Old API deprecated. Use new and remove old usage where necessary.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-01-10 17:21:16 +00:00
parent e896726a47
commit eecb33b018
9 changed files with 289 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/string.cpp
View File

@@ -1024,7 +1024,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
size_t nRealSize;
wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);
//Copy
//Copy
if (nRealSize)
assign( theBuffer.data() , nRealSize - 1 );
}
@@ -1080,7 +1080,7 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
size_t nRealSize;
wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
//Copy
//Copy
if (nRealSize)
assign( theBuffer.data() , nRealSize - 1 );
}
@@ -1629,7 +1629,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
wxString& wxString::Trim(bool bFromRight)
{
// first check if we're going to modify the string at all
if ( !IsEmpty() &&
if ( !empty() &&
(
(bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
(!bFromRight && wxSafeIsspace(GetChar(0u)))
@@ -2195,6 +2195,11 @@ wxString* wxArrayString::GetStringArray() const
return array;
}
void wxArrayString::Remove(size_t nIndex, size_t nRemove)
{
RemoveAt(nIndex, nRemove);
}
#endif // WXWIN_COMPATIBILITY_2_4
// searches the array for an item (forward or backwards)