#if 0
case wxFONTENCODING_UTF7 :
enc = CreateTextEncoding(kCFStringEncodingUnicodeDefault,0,kUnicodeUTF7Format) ;
-#endif
break ;
+#endif
case wxFONTENCODING_UTF8 :
enc = kCFStringEncodingUTF8;
break ;
// native = wchar_t 4 bytes for us
const wchar_t * const data = str.wc_str();
const size_t size = str.length()*sizeof(wchar_t);
+ CFStringBuiltInEncodings cfencoding = kCFStringEncodingUTF32Native;
#elif wxUSE_UNICODE_UTF8
// native = utf8
const char * const data = str.utf8_str();
const size_t size = str.utf8_length();
+ CFStringBuiltInEncodings cfencoding = kCFStringEncodingUTF8;
#else
#error "unsupported Unicode representation"
#endif
reset( CFStringCreateWithBytes( kCFAllocatorDefault,
- (const UInt8*)data, size, kCFStringEncodingUTF8, false /* no BOM */ ) );
+ (const UInt8*)data, size, cfencoding, false /* no BOM */ ) );
#else // not wxUSE_UNICODE
reset( CFStringCreateWithCString( kCFAllocatorSystemDefault , str.c_str() ,
wxMacGetSystemEncFromFontEnc( encoding ) ) );
}
}
-wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
+wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UNICODE(encoding) )
{
- if ( !get() )
+ if ( !ref )
return wxEmptyString ;
- Size cflen = CFStringGetLength( get() ) ;
- char* buf = NULL ;
+ Size cflen = CFStringGetLength( ref ) ;
- CFStringEncoding cfencoding = 0;
- wxString result;
+ CFStringEncoding cfencoding;
+ wxString result;
#if wxUSE_UNICODE
#if wxUSE_UNICODE_WCHAR
cfencoding = kCFStringEncodingUTF32Native;
#endif
CFIndex cStrLen ;
- CFStringGetBytes( get() , CFRangeMake(0, cflen) , cfencoding ,
+ CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,
'?' , false , NULL , 0 , &cStrLen ) ;
- buf = new char[ cStrLen ] ;
- CFStringGetBytes( get() , CFRangeMake(0, cflen) , cfencoding,
+ char* 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);
#error "unsupported unicode representation"
#endif
#else
- wxString result(buf, cStrLen) ;
+ result = wxString(buf, cStrLen) ;
#endif
-
+
delete[] buf ;
wxMacConvertNewlines10To13( &result);
return result ;
}
+wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
+{
+ return AsString( get(), encoding );
+}
+
+#if wxOSX_USE_COCOA_OR_IPHONE
+wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
+{
+ return AsString( (CFStringRef) ref, encoding );
+}
+#endif
+
+
//
// wxMacUniCharBuffer
//
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 ) ;
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()
free( m_ubuf ) ;
}
-UniCharPtr wxMacUniCharBuffer::GetBuffer()
+UniCharPtr wxMacUniCharBuffer::GetBuffer()
{
return m_ubuf ;
}
-
+
UniCharCount wxMacUniCharBuffer::GetChars()
{
return m_chars ;