Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string conversion bug fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-10-22 17:10:20 +00:00
parent 46e2a2e7f6
commit be6628ce35
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mac/carbon/utils.cpp
View File

@@ -803,19 +803,29 @@ void wxMacConvertNewlines10To13( char * data )
void wxMacConvertNewlines13To10( wxString * data ) void wxMacConvertNewlines13To10( wxString * data )
{ {
if ( data->Length() == 0 ) size_t len = data->Length() ;
if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
return ; return ;
wxMacConvertNewlines13To10( data->GetWriteBuf( data->Length() ) ) ; wxString temp(*data) ;
data->UngetWriteBuf() ; wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines13To10( buf ) ;
} }
void wxMacConvertNewlines10To13( wxString * data ) void wxMacConvertNewlines10To13( wxString * data )
{ {
if ( data->Length() == 0 ) size_t len = data->Length() ;
if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
return ; return ;
wxMacConvertNewlines10To13( data->GetWriteBuf( data->Length() ) ) ;
data->UngetWriteBuf() ; wxString temp(*data) ;
wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines10To13( buf ) ;
} }

22
src/mac/utils.cpp
View File

@@ -803,19 +803,29 @@ void wxMacConvertNewlines10To13( char * data )
void wxMacConvertNewlines13To10( wxString * data ) void wxMacConvertNewlines13To10( wxString * data )
{ {
if ( data->Length() == 0 ) size_t len = data->Length() ;
if ( len == 0 || wxStrchr(data->c_str(),0x0d)==NULL)
return ; return ;
wxMacConvertNewlines13To10( data->GetWriteBuf( data->Length() ) ) ; wxString temp(*data) ;
data->UngetWriteBuf() ; wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines13To10( buf ) ;
} }
void wxMacConvertNewlines10To13( wxString * data ) void wxMacConvertNewlines10To13( wxString * data )
{ {
if ( data->Length() == 0 ) size_t len = data->Length() ;
if ( data->Length() == 0 || wxStrchr(data->c_str(),0x0a)==NULL)
return ; return ;
wxMacConvertNewlines10To13( data->GetWriteBuf( data->Length() ) ) ;
data->UngetWriteBuf() ; wxString temp(*data) ;
wxStringBuffer buf(*data,len ) ;
memcpy( buf , temp.c_str() , (len+1)*sizeof(wxChar) ) ;
wxMacConvertNewlines10To13( buf ) ;
} }