No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it. Some files containing third-party sources (src/msw/wince/time.cpp, src/x11/pango*.cpp) were left unchanged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -130,11 +130,11 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
|
||||
else
|
||||
{
|
||||
// NOTE: Includes NULL iff source did
|
||||
/* NOTE: This is an approximation. The eventual UTF-32 will
|
||||
/* NOTE: This is an approximation. The eventual UTF-32 will
|
||||
* possibly have less elements but certainly not more.
|
||||
*/
|
||||
size_t returnSize = CFStringGetLength(theString);
|
||||
|
||||
|
||||
if (dstSize == 0 || dst == NULL)
|
||||
{
|
||||
return returnSize;
|
||||
@@ -144,13 +144,13 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
|
||||
// for an undersized UTF-32 destination buffer.
|
||||
CFRange fullStringRange = CFRangeMake(0, CFStringGetLength(theString));
|
||||
UniChar *szUniCharBuffer = new UniChar[fullStringRange.length];
|
||||
|
||||
|
||||
CFStringGetCharacters(theString, fullStringRange, szUniCharBuffer);
|
||||
|
||||
|
||||
wxMBConvUTF16 converter;
|
||||
returnSize = converter.ToWChar( dst, dstSize, (const char*)szUniCharBuffer, fullStringRange.length );
|
||||
delete [] szUniCharBuffer;
|
||||
|
||||
|
||||
return returnSize;
|
||||
}
|
||||
// NOTREACHED
|
||||
@@ -205,7 +205,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_cf(wxFontEncoding encoding)
|
||||
CFIndex usedBufLen;
|
||||
|
||||
CFIndex charsConverted = CFStringGetBytes(
|
||||
theString,
|
||||
theString,
|
||||
CFRangeMake(0, CFStringGetLength(theString)),
|
||||
m_encoding,
|
||||
0, // FAIL on unconvertible characters
|
||||
|
||||
Reference in New Issue
Block a user