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:
@@ -641,7 +641,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
|
||||
char* buf = NULL ;
|
||||
|
||||
CFStringEncoding cfencoding = 0;
|
||||
wxString result;
|
||||
wxString result;
|
||||
#if wxUSE_UNICODE
|
||||
#if wxUSE_UNICODE_WCHAR
|
||||
cfencoding = kCFStringEncodingUTF32Native;
|
||||
@@ -660,7 +660,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
|
||||
buf = new char[ cStrLen ] ;
|
||||
CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,
|
||||
'?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
|
||||
|
||||
|
||||
#if wxUSE_UNICODE
|
||||
#if wxUSE_UNICODE_WCHAR
|
||||
result = wxString( (const wchar_t*) buf , cStrLen/4);
|
||||
@@ -672,7 +672,7 @@ wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UN
|
||||
#else
|
||||
result = wxString(buf, cStrLen) ;
|
||||
#endif
|
||||
|
||||
|
||||
delete[] buf ;
|
||||
wxMacConvertNewlines10To13( &result);
|
||||
return result ;
|
||||
@@ -684,7 +684,7 @@ wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
|
||||
}
|
||||
|
||||
#if wxOSX_USE_COCOA_OR_IPHONE
|
||||
wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
|
||||
wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
|
||||
{
|
||||
return AsString( (CFStringRef) ref, encoding );
|
||||
}
|
||||
@@ -731,11 +731,11 @@ wxMacUniCharBuffer::~wxMacUniCharBuffer()
|
||||
free( m_ubuf ) ;
|
||||
}
|
||||
|
||||
UniCharPtr wxMacUniCharBuffer::GetBuffer()
|
||||
UniCharPtr wxMacUniCharBuffer::GetBuffer()
|
||||
{
|
||||
return m_ubuf ;
|
||||
}
|
||||
|
||||
|
||||
UniCharCount wxMacUniCharBuffer::GetChars()
|
||||
{
|
||||
return m_chars ;
|
||||
|
Reference in New Issue
Block a user