From 3dccf96eabc68d95839782d35e6193855f007fd2 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 14 Apr 2007 09:33:10 +0000
Subject: [PATCH] cleaning up problems after string changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/corefoundation/cfstring.cpp | 49 +++++--------------------------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/src/mac/corefoundation/cfstring.cpp b/src/mac/corefoundation/cfstring.cpp
index 8cfdec8..8571f13 100644
--- a/src/mac/corefoundation/cfstring.cpp
+++ b/src/mac/corefoundation/cfstring.cpp
@@ -47,56 +47,19 @@ void wxMacConvertNewlines10To13( char * data )
     }
 }
 
+const wxString sCR((wxChar)13);
+const wxString sLF((wxChar)10);
+
 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 )
 {
-    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 ;
@@ -703,9 +666,9 @@ wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
 #endif
 
     buf[noChars] = 0 ;
-    wxMacConvertNewlines10To13( buf ) ;
     wxString result(buf) ;
     delete[] buf ;
+    wxMacConvertNewlines10To13( &result);
     return result ;
 }
 
-- 
2.7.4