X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80fdcdb90ef779185492dab676d461fc34933312..f86a4930f2c69058684496a1882343fe8e709bf2:/src/osx/core/cfstring.cpp diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index c3bfcce19b..3aca67c90d 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -632,6 +632,18 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN } } +wxString wxCFStringRef::AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding ) +{ + if ( !ref ) + return wxEmptyString ; + + CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, ref); + CFStringNormalize(cfMutableString,kCFStringNormalizationFormC); + wxString str = wxCFStringRef::AsString(ref,encoding); + CFRelease(cfMutableString); + return str; +} + wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UNICODE(encoding) ) { if ( !ref ) @@ -687,7 +699,12 @@ wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding ) { return AsString( (CFStringRef) ref, encoding ); } -#endif + +wxString wxCFStringRef::AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding ) +{ + return AsStringWithNormalizationFormC( (CFStringRef) ref, encoding ); +} +#endif // wxOSX_USE_COCOA_OR_IPHONE //