X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef0e92205a01c7d0ca6f381cc690cb5d4fa595c9..d3ad22bdb33cdba830923932e208f030f61669b4:/include/wx/osx/core/cfstring.h?ds=inline

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index 523b5f3462..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:
@@ -19,6 +19,12 @@
 #include "wx/fontenc.h"
 #include "wx/osx/core/cfref.h"
 
+#ifdef WORDS_BIGENDIAN
+    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE
+#else
+    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE
+#endif
+
 class WXDLLIMPEXP_FWD_BASE wxString;
 
 WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ;
@@ -41,13 +47,20 @@ public:
     wxCFStringRef(const wxString &str,
                         wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
 
+#if wxOSX_USE_COCOA_OR_IPHONE
+    wxCFStringRef(NSString* 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)
     {
     }
 
@@ -55,8 +68,18 @@ public:
     {
     }
 
-    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+    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
+    NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }
+#endif
 private:
 } ;