X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65391c8ffcb388cd31f610776654f50aed97cbee..df7d93f67bae4a7598dc7058f90f35acb7bd584a:/src/osx/core/cfstring.cpp diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 96bc244d38..fa1840f44c 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -696,10 +696,6 @@ wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) wxMacUniCharBuffer::wxMacUniCharBuffer( const wxString &str ) { - m_chars = str.length() ; - m_ubuf = NULL ; - -#if SIZEOF_WCHAR_T == 4 wxMBConvUTF16 converter ; #if wxUSE_UNICODE size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; @@ -712,17 +708,6 @@ wxMacUniCharBuffer::wxMacUniCharBuffer( const wxString &str ) converter.WC2MB( (char*) m_ubuf , wchar.data() , unicharlen + 2 ) ; #endif m_chars = unicharlen / 2 ; -#else // SIZEOF_WCHAR_T is then 2 -#if wxUSE_UNICODE - m_ubuf = malloc( m_chars * 2 + 2 ) ; - memcpy( m_ubuf , (UniChar*) str.wc_str() , m_chars * 2 + 2 ) ; -#else - wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; - m_chars = wxWcslen( wchar.data() ) ; - m_ubuf = malloc( m_chars * 2 + 2 ) ; - memcpy( m_ubuf , (UniChar*) wchar.data() , m_chars * 2 + 2 ) ; -#endif -#endif } wxMacUniCharBuffer::~wxMacUniCharBuffer()