Minor corrections to sorted arrays documentation.

[wxWidgets.git] / src / osx / core / cfstring.cpp

diff --git a/src/osx/core/cfstring.cpp b/src/osx/core/cfstring.cpp
index 3d10e29b7e071780fdf2a477314e81af5f6a24d9..46a9c0c8af28b9cf976a3ea33d091aa37d64aa3c 100644 (file)
--- a/src/osx/core/cfstring.cpp
+++ b/src/osx/core/cfstring.cpp
@@ -632,16 +632,16 @@ wxCFStringRef::wxCFStringRef( const wxString &st , wxFontEncoding WXUNUSED_IN_UN
     }
 }
 
     }
 }
 

-wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
+wxString wxCFStringRef::AsString( CFStringRef ref, wxFontEncoding WXUNUSED_IN_UNICODE(encoding) )

 {
 {

-    if ( !get() )
+    if ( !ref )

         return wxEmptyString ;
 
         return wxEmptyString ;
 

-    Size cflen = CFStringGetLength( get() )  ;
+    Size cflen = CFStringGetLength( ref )  ;

     char* buf = NULL ;
 
     CFStringEncoding cfencoding = 0;
     char* buf = NULL ;
 
     CFStringEncoding cfencoding = 0;

-    wxString result;    
+    wxString result;

 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     cfencoding = kCFStringEncodingUTF32Native;
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     cfencoding = kCFStringEncodingUTF32Native;


@@ -655,12 +655,12 @@ wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
 #endif
 
     CFIndex cStrLen ;
 #endif
 
     CFIndex cStrLen ;

-    CFStringGetBytes( get() , CFRangeMake(0, cflen) , cfencoding ,
+    CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding ,

         '?' , false , NULL , 0 , &cStrLen ) ;
     buf = new char[ cStrLen ] ;
         '?' , false , NULL , 0 , &cStrLen ) ;
     buf = new char[ cStrLen ] ;

-    CFStringGetBytes( get() , CFRangeMake(0, cflen) , cfencoding,
+    CFStringGetBytes( ref , CFRangeMake(0, cflen) , cfencoding,

         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;
         '?' , false , (unsigned char*) buf , cStrLen , &cStrLen) ;

-    
+

 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     result = wxString( (const wchar_t*) buf , cStrLen/4);
 #if wxUSE_UNICODE
   #if wxUSE_UNICODE_WCHAR
     result = wxString( (const wchar_t*) buf , cStrLen/4);


@@ -672,12 +672,25 @@ wxString wxCFStringRef::AsString(wxFontEncoding WXUNUSED_IN_UNICODE(encoding))
 #else
     result = wxString(buf, cStrLen) ;
 #endif
 #else
     result = wxString(buf, cStrLen) ;
 #endif

-    
+

     delete[] buf ;
     wxMacConvertNewlines10To13( &result);
     return result ;
 }
 
     delete[] buf ;
     wxMacConvertNewlines10To13( &result);
     return result ;
 }
 

+wxString wxCFStringRef::AsString(wxFontEncoding encoding) const
+{
+    return AsString( get(), encoding );
+}
+
+#if wxOSX_USE_COCOA_OR_IPHONE
+wxString wxCFStringRef::AsString( NSString* ref, wxFontEncoding encoding )
+{
+    return AsString( (CFStringRef) ref, encoding );
+}
+#endif
+
+

 //
 // wxMacUniCharBuffer
 //
 //
 // wxMacUniCharBuffer
 //


@@ -718,11 +731,11 @@ wxMacUniCharBuffer::~wxMacUniCharBuffer()
     free( m_ubuf ) ;
 }
 
     free( m_ubuf ) ;
 }
 

-UniCharPtr wxMacUniCharBuffer::GetBuffer() 
+UniCharPtr wxMacUniCharBuffer::GetBuffer()

 {
     return m_ubuf ;
 }
 {
     return m_ubuf ;
 }

-   
+

 UniCharCount wxMacUniCharBuffer::GetChars()
 {
     return m_chars ;
 UniCharCount wxMacUniCharBuffer::GetChars()
 {
     return m_chars ;