X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2cbfa061b44c7460adf3f06d09b4fbf304ed3a87..ab9cf6366e3341a5fa1804beb3f359a5ef66e4dd:/src/common/string.cpp diff --git a/src/common/string.cpp b/src/common/string.cpp index 6b21ca1b09..4d16458ff8 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -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)