X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/456057f8d4981ea1a456c47f545ea9f9e50af219..94734b4e51431d4d4d5bccaf011b28e82515091e:/include/wx/osx/core/cfstring.h?ds=sidebyside

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index 30d4319493..66a86760da 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)
     {
     }
 
@@ -68,7 +68,12 @@ public:
     {
     }
 
-    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
+
+    static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+#if wxOSX_USE_COCOA_OR_IPHONE
+    static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
+#endif
 
 #if wxOSX_USE_COCOA_OR_IPHONE
     NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }