X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f66ecdc4fbfa14f18f95331ba859a85baee36ae6..33f3e2b31ed781ba1446b49ec6d3e226c0a5c652:/include/wx/osx/core/cfstring.h diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h index e60bb91548..addef26fd7 100644 --- a/include/wx/osx/core/cfstring.h +++ b/include/wx/osx/core/cfstring.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/corefoundation/cfstring.h +// Name: wx/osx/core/cfstring.h // Purpose: wxCFStringRef and other string functions // Author: Stefan Csomor // Modified by: @@ -49,18 +49,18 @@ public: #if wxOSX_USE_COCOA_OR_IPHONE wxCFStringRef(NSString* ref) - : wxCFRef< CFStringRef >((CFStringRef) ref) + : wxCFRef< CFStringRef >((CFStringRef) ref) { } #endif wxCFStringRef(CFStringRef ref) - : wxCFRef< CFStringRef >(ref) + : wxCFRef< CFStringRef >(ref) { } wxCFStringRef(const wxCFStringRef& otherRef ) - : wxCFRef< CFStringRef >(otherRef) + : wxCFRef< CFStringRef >(otherRef) { } @@ -69,10 +69,12 @@ public: } wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const; - + static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ; + 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