added DockFixed() pane option; doc updates

[wxWidgets.git] / src / mac / corefoundation / cfstring.cpp

diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp
index ace47930f9556462770038d9fb6b7fefbc4d818b..8571f130978cd40cb591e654fe8cf77de5354ce2 100644 (file)
--- a/src/mac/corefoundation/cfstring.cpp
+++ b/src/mac/corefoundation/cfstring.cpp
@@ -10,15 +10,16 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/intl.h"

+    #if wxUSE_GUI
+        #include "wx/font.h"
+    #endif

 #endif
 #endif

-#include "wx/mac/corefoundation/cfstring.h"

 
 

-#if wxUSE_GUI
-    #include "wx/font.h"
-#endif
+#include "wx/mac/corefoundation/cfstring.h"

 
 #ifdef __DARWIN__
     #include <CoreServices/CoreServices.h>
 
 #ifdef __DARWIN__
     #include <CoreServices/CoreServices.h>


@@ -46,56 +47,19 @@ void wxMacConvertNewlines10To13( char * data )
     }
 }
 
     }
 }
 

+const wxString sCR((wxChar)13);
+const wxString sLF((wxChar)10);
+

 void wxMacConvertNewlines13To10( wxString * data )
 {
 void wxMacConvertNewlines13To10( wxString * data )
 {

-    size_t len = data->Length() ;
-
-    if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
-        return ;
-
-    wxString temp(*data) ;
-    wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
-
-    wxMacConvertNewlines13To10( buf ) ;
+    data->Replace( sCR,sLF);

 }
 
 void wxMacConvertNewlines10To13( wxString * data )
 {
 }
 
 void wxMacConvertNewlines10To13( wxString * data )
 {

-    size_t len = data->Length() ;
-
-    if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
-        return ;
-
-    wxString temp(*data) ;
-    wxStringBuffer buf(*data,len ) ;
-    memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
-    wxMacConvertNewlines10To13( buf ) ;
+    data->Replace( sLF,sCR);

 }
 
 }
 

-
-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data )
-{
-    wxChar * buf = data ;
-    while( (buf=wxStrchr(buf,0x0d)) != NULL )
-    {
-        *buf = 0x0a ;
-        buf++ ;
-    }
-}
-
-void wxMacConvertNewlines10To13( wxChar * data )
-{
-    wxChar * buf =  data ;
-    while( (buf=wxStrchr(buf,0x0a)) != NULL )
-    {
-        *buf = 0x0d ;
-        buf++ ;
-    }
-}
-#endif
-

 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 {
     TextEncodingBase enc = 0 ;
 wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 {
     TextEncodingBase enc = 0 ;


@@ -104,9 +68,10 @@ wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding)
 #if wxUSE_GUI
         encoding = wxFont::GetDefaultEncoding() ;
 #else
 #if wxUSE_GUI
         encoding = wxFont::GetDefaultEncoding() ;
 #else

-        encoding = wxLocale::GetSystemEncoding() ;
+        encoding = wxFONTENCODING_SYSTEM; // to be set below

 #endif
     }
 #endif
     }

+

     if ( encoding == wxFONTENCODING_SYSTEM )
     {
         enc = CFStringGetSystemEncoding();
     if ( encoding == wxFONTENCODING_SYSTEM )
     {
         enc = CFStringGetSystemEncoding();


@@ -633,7 +598,7 @@ wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding)
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
 {
 // converts this string into a carbon foundation string with optional pc 2 mac encoding
 void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
 {

-    Release() ; 
+    Release() ;

     if (st.IsEmpty())
     {
         m_cfs = CFSTR("") ;
     if (st.IsEmpty())
     {
         m_cfs = CFSTR("") ;


@@ -648,7 +613,7 @@ void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
         m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
             (UniChar*)str.wc_str() , str.Len() );
 #else
         m_cfs = CFStringCreateWithCharacters( kCFAllocatorDefault,
             (UniChar*)str.wc_str() , str.Len() );
 #else

-        wxMBConvUTF16BE converter ;
+        wxMBConvUTF16 converter ;

         size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
         UniChar *unibuf = new UniChar[ unicharlen / sizeof(UniChar) + 1 ] ;
         converter.WC2MB( (char*)unibuf , str.wc_str() , unicharlen ) ;
         size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
         UniChar *unibuf = new UniChar[ unicharlen / sizeof(UniChar) + 1 ] ;
         converter.WC2MB( (char*)unibuf , str.wc_str() , unicharlen ) ;


@@ -666,6 +631,9 @@ void wxMacCFStringHolder::Assign( const wxString &st , wxFontEncoding encoding )
 
 wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 {
 
 wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 {

+    if ( m_cfs == NULL )
+        return wxEmptyString ;
+

     Size cflen = CFStringGetLength( m_cfs )  ;
     size_t noChars ;
     wxChar* buf = NULL ;
     Size cflen = CFStringGetLength( m_cfs )  ;
     size_t noChars ;
     wxChar* buf = NULL ;


@@ -679,10 +647,12 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
     UniChar* unibuf = new UniChar[ cflen + 1 ] ;
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) unibuf ) ;
     unibuf[cflen] = 0 ;
     UniChar* unibuf = new UniChar[ cflen + 1 ] ;
     CFStringGetCharacters( m_cfs , CFRangeMake( 0 , cflen ) , (UniChar*) unibuf ) ;
     unibuf[cflen] = 0 ;

-    wxMBConvUTF16BE converter ;
+    wxMBConvUTF16 converter ;

     noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;
     noChars = converter.MB2WC( NULL , (const char*)unibuf , 0 ) ;

+    wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Unable to count the number of characters in this string!") );

     buf = new wxChar[ noChars + 1 ] ;
     buf = new wxChar[ noChars + 1 ] ;

-    converter.MB2WC( buf , (const char*)unibuf , noChars ) ;
+    noChars = converter.MB2WC( buf , (const char*)unibuf , noChars + 1 ) ;
+    wxASSERT_MSG( noChars != wxCONV_FAILED, _T("Conversion of string failed!") );

     delete[] unibuf ;
 #endif
 #else
     delete[] unibuf ;
 #endif
 #else


@@ -696,9 +666,55 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 #endif
 
     buf[noChars] = 0 ;
 #endif
 
     buf[noChars] = 0 ;

-    wxMacConvertNewlines10To13( buf ) ;

     wxString result(buf) ;
     delete[] buf ;
     wxString result(buf) ;
     delete[] buf ;

+    wxMacConvertNewlines10To13( &result);

     return result ;
 }
 
     return result ;
 }
 

+
+wxMacUniCharBuffer::wxMacUniCharBuffer( const wxString &str )
+{
+    m_chars = str.length() ;
+    m_ubuf = NULL ;
+
+#if SIZEOF_WCHAR_T == 4
+    wxMBConvUTF16 converter ;
+#if wxUSE_UNICODE
+    size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ;
+    m_ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
+    converter.WC2MB( (char*) m_ubuf , str.wc_str(), unicharlen + 2 ) ;
+#else
+    const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;
+    size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ;
+    m_ubuf = (UniChar*) malloc( unicharlen + 2 ) ;
+    converter.WC2MB( (char*) m_ubuf , wchar.data() , unicharlen + 2 ) ;
+#endif
+    m_chars = unicharlen / 2 ;
+#else // SIZEOF_WCHAR_T is then 2
+#if wxUSE_UNICODE
+    m_ubuf = malloc( m_chars * 2 + 2 ) ;
+    memcpy( m_ubuf , (UniChar*) str.wc_str() , m_chars * 2 + 2 ) ;
+#else
+    wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ;
+    m_chars = wxWcslen( wchar.data() ) ;
+    m_ubuf = malloc( m_chars * 2 + 2 ) ;
+    memcpy( m_ubuf , (UniChar*) wchar.data() , m_chars * 2 + 2 ) ;
+#endif
+#endif
+}
+
+wxMacUniCharBuffer::~wxMacUniCharBuffer()
+{
+    free( m_ubuf ) ;
+}
+
+UniCharArrayPtr wxMacUniCharBuffer::GetBuffer() 
+{
+    return m_ubuf ;
+}
+   
+UniCharCount wxMacUniCharBuffer::GetChars()
+{
+    return m_chars ;
+}