Use an enum for the colour/string conversion flags

[wxWidgets.git] / include / wx / osx / core / cfstring.h

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index 523b5f34624a8d15f0275630673e7b534567ebeb..66a86760da827ad661f9041c222ca3d7baa1ce4b 100644 (file)
--- 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:
 // 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"
 
 #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 ) ;
 class WXDLLIMPEXP_FWD_BASE wxString;
 
 WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ;


@@ -41,13 +47,20 @@ public:
     wxCFStringRef(const wxString &str,
                         wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
 
     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)
     wxCFStringRef(CFStringRef ref)

-        : wxCFRef< CFStringRef >(ref) 
+        : wxCFRef< CFStringRef >(ref)

     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )
     {
     }
 
     wxCFStringRef(const wxCFStringRef& otherRef )

-        : wxCFRef< CFStringRef >(otherRef) 
+        : wxCFRef< CFStringRef >(otherRef)

     {
     }
 
     {
     }
 


@@ -55,8 +68,16 @@ 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; }
+#endif

 private:
 } ;
 
 private:
 } ;