wxFAIL_MSG( _T("out of memory in wxStringBase::InitWith") );
return;
}
- memcpy(m_pchData, psz + nPos, nLength*sizeof(wxChar));
+ wxMemcpy(m_pchData, psz + nPos, nLength);
}
}
// allocation failures are handled by the caller
return false;
}
- memcpy(m_pchData, pData->data(), nLen*sizeof(wxChar));
+ wxMemcpy(m_pchData, pData->data(), nLen);
}
wxASSERT( !GetStringData()->IsShared() ); // we must be the only owner
wxASSERT( nStart <= length() );
//anchor
- const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart,
- str.c_str()[0],
+ const wxChar* p = (const wxChar*)wxMemchr(c_str() + nStart,
+ str.c_str()[0],
length() - nStart);
-
+
if(!p)
return npos;
wxMemcmp(p, str.c_str(), str.length()) )
{
//anchor again
- p = (const wxChar*)wxMemchr(++p,
- str.c_str()[0],
+ p = (const wxChar*)wxMemchr(++p,
+ str.c_str()[0],
length() - (p - c_str()));
if(!p)
return npos;
}
-
+
return (p - c_str() + str.length() <= length()) ? p - c_str() : npos;
}
}
size_t len = wxStrlen(sz);
-
+
for ( const wxChar *p = c_str() + nStart; p >= c_str(); --p )
{
if ( wxMemchr(sz, *p, len) )
wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
size_t nCount, wxChar ch)
{
- return replace(nStart, nLen, wxStringBase(ch, nCount).c_str());
+ return replace(nStart, nLen, wxStringBase(nCount, ch).c_str());
}
wxStringBase& wxStringBase::replace(size_t nStart, size_t nLen,
// ===========================================================================
// ---------------------------------------------------------------------------
-// construction
+// construction and conversion
// ---------------------------------------------------------------------------
#if wxUSE_UNICODE
if ( psz )
{
// calculate the needed size ourselves or use the provided one
- nLen = conv.MB2WC(NULL, psz, 0);
+ if (nLength == npos)
+ nLen = strlen(psz);
+ else
+ nLen = nLength;
}
else
{
nLen = 0;
}
+
// anything to do?
if ( (nLen != 0) && (nLen != (size_t)-1) )
{
- if ( !Alloc(nLen) )
- {
- wxFAIL_MSG( _T("out of memory in wxString::wxString") );
- }
- else
+ //Get length of converted string
+ size_t dwConvLen = conv.MB2WC(NULL, psz, 0, nLen);
+
+ //if valid, do the conversion
+ if (dwConvLen != (size_t) -1)
{
- wxWCharBuffer buf(nLen);
- // MB2WC wants the buffer size, not the string length hence +1
- nLen = conv.MB2WC(buf.data(), psz, nLen + 1);
+ //Get internal buffer
+ wxStringBufferLength internalBuffer(*this, dwConvLen + 1);
- if ( nLen != (size_t)-1 )
- {
- // initialized ok, set the real length as nLength specified by
- // the caller could be greater than the real string length
- assign(buf.data(), nLen);
- return;
- }
- //else: the conversion failed -- leave the string empty (what else?)
+ //Do the actual conversion & Set the length of the buffer
+ internalBuffer.SetLength(
+ conv.MB2WC(internalBuffer, psz, dwConvLen + 1, nLen)
+ );
}
}
-}
+}
+//Convert wxString in Unicode mode to a multi-byte string
const wxCharBuffer wxString::mb_str(wxMBConv& conv) const
{
- const wxChar* szEnd = (*this).c_str() + length() + 1;
- const wxChar* szPos = (*this).c_str();
- const wxChar* szStart = szPos;
-
- wxCharBuffer buffer(length() + 1);
-
- //Convert the string until the length() is reached, continuing the
- //loop every time a null character is reached
- while(szPos != szEnd)
+ //Get length of converted string
+ size_t dwConvLen = conv.WC2MB(NULL, (*this).c_str(), 0, length());
+
+ //if valid, do the conversion
+ if (dwConvLen != (size_t) -1)
{
- size_t nLen = conv.WC2MB(NULL, szPos, 0);
-
- wxASSERT(nLen != (size_t)-1); //should not be true! If it is system wctomb could be bad
+ //Create good buffer
+ wxCharBuffer buffer(dwConvLen + 1);
- if ( conv.WC2MB(&buffer.data()[szPos - szStart], szPos, nLen + 1) == (size_t)-1 )
- {
- //error - return empty buffer
- wxFAIL_MSG(wxT("Error converting wide-character string to a multi-byte string"));
- buffer.data()[0] = '\0';
- return buffer;
- }
-
- szPos += nLen + 1;
- }
-
+ //Do the actual conversion
+ conv.WC2MB(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
+
+ return buffer;
+ }
+
+ //create bogus buffer
+ wxCharBuffer buffer(1);
+ buffer.data()[0u] = 0;
return buffer;
}
if ( pwz )
{
// calculate the needed size ourselves or use the provided one
- nLen = conv.WC2MB(NULL, pwz, 0);
+ if (nLength == npos)
+ nLen = wxWcslen(pwz);
+ else
+ nLen = nLength;
}
else
{
// anything to do?
if ( (nLen != 0) && (nLen != (size_t)-1) )
{
- if ( !Alloc(nLen) )
- {
- wxFAIL_MSG( _T("out of memory in wxString::wxString") );
- }
- else
+ //Get length of converted string
+ size_t dwConvLen = conv.WC2MB(NULL, pwz, 0, nLen);
+
+ //if valid, do the conversion
+ if (dwConvLen != (size_t) -1)
{
- wxCharBuffer buf(nLen);
- // WC2MB wants the buffer size, not the string length
- if ( conv.WC2MB(buf.data(), pwz, nLen + 1) != (size_t)-1 )
- {
- // initialized ok
- assign(buf.data(), nLen);
- return;
- }
- //else: the conversion failed -- leave the string empty (what else?)
+ //Get internal buffer
+ wxStringBufferLength internalBuffer(*this, dwConvLen + 1);
+
+ //Do the actual conversion & Set the length of the buffer
+ internalBuffer.SetLength(
+ conv.WC2MB(internalBuffer, pwz, dwConvLen + 1, nLen)
+ );
}
}
-
- // leave empty
}
+//Converts this string to a wide character string if unicode
+//mode is not enabled and wxUSE_WCHAR_T is enabled
const wxWCharBuffer wxString::wc_str(wxMBConv& conv) const
{
- const wxChar* szEnd = (*this).c_str() + length() + 1;
- const wxChar* szPos = (*this).c_str();
- const wxChar* szStart = szPos;
-
- wxWCharBuffer buffer(length() + 1);
-
- //Convert the string until the length() is reached, continuing the
- //loop every time a null character is reached
- while(szPos != szEnd)
+ //Get length of converted string
+ size_t dwConvLen = conv.MB2WC(NULL, (*this).c_str(), 0, length());
+
+ //if valid, do the conversion
+ if (dwConvLen != (size_t) -1)
{
- size_t nLen = conv.MB2WC(NULL, szPos, 0);
-
- wxASSERT(nLen != (size_t)-1); //should not be true! If it is system mbtowc could be bad
-
- if ( conv.MB2WC(&buffer.data()[szPos - szStart], szPos, nLen + 1) == (size_t)-1 )
- {
- //error - return empty buffer
- wxFAIL_MSG(wxT("Error converting multi-byte string to a wide-character string"));
- buffer.data()[0] = '\0';
- return buffer;
- }
-
- szPos += nLen + 1;
- }
-
+ //Create good buffer
+ wxWCharBuffer buffer(dwConvLen + 1);
+
+ //Do the actual conversion
+ conv.MB2WC(buffer.data(), (*this).c_str(), dwConvLen + 1, length());
+
+ return buffer;
+ }
+
+ //create bogus buffer
+ wxWCharBuffer buffer(1);
+ buffer.data()[0u] = 0;
return buffer;
}
-
+
#endif // wxUSE_WCHAR_T
#endif // Unicode/ANSI
const wchar_t *pwc = c_str();
for ( ;; )
{
- *dest++ = *pwc > SCHAR_MAX ? '_' : *pwc;
+ *dest++ = *pwc > SCHAR_MAX ? wxT('_') : *pwc;
// the output string can't have embedded NULs anyhow, so we can safely
// stop at first of them even if we do have any
{
const wxChar *s = (const wxChar*) *this;
if (wxStrlen(s))
- if ((s[0] == '-') || (s[0] == '+')) s++;
+ if ((s[0] == wxT('-')) || (s[0] == wxT('+'))) s++;
while(*s){
if(!wxIsdigit(*s)) return(false);
s++;
projects / wxWidgets.git / blobdiff