From 4ccde09b18b3d6af50662aa1be4a24401e00db30 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 4 Nov 2012 23:53:52 +0000 Subject: [PATCH] Add wxCFStringRef::AsStringWithNormalizationFormC() Cocoa overload. Provide an overload taking NSString and casting it to CFStringRef, just as for AsStringWithNormalizationFormC(). See #13504. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/core/cfstring.h | 1 + src/osx/core/cfstring.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index 385527e75e..addef26fd7 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -74,6 +74,7 @@ public: static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; #if wxOSX_USE_COCOA_OR_IPHONE static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; + static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; #endif #if wxOSX_USE_COCOA_OR_IPHONE diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp index 9182556e4c..3aca67c90d 100644 --- a/src/osx/core/cfstring.cpp +++ b/src/osx/core/cfstring.cpp @@ -699,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 // -- 2.45.2