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

line ending commands under condition of PC endings (added also to WriteText)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-10-15 15:01:09 +00:00
parent 74587a6b43
commit 665bb65698
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mac/carbon/textctrl.cpp
View File

@@ -785,11 +785,13 @@ wxString wxTextCtrl::GetValue() const
wxString value; wxString value;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakePCStringFromMac( wxBuffer ) ; value = wxMacMakePCStringFromMac( wxBuffer ) ;
value.Replace( "\r", "\n" );
}
else else
value = wxBuffer; value = wxBuffer;
value.Replace( "\r", "\n" );
return value; return value;
} }
@@ -812,11 +814,13 @@ void wxTextCtrl::SetValue(const wxString& st)
wxString value; wxString value;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakeMacStringFromPC( st ) ; value = wxMacMakeMacStringFromPC( st ) ;
value.Replace( "\n", "\r" );
}
else else
value = st; value = st;
value.Replace( "\n", "\r" );
if ( !m_macUsesTXN ) if ( !m_macUsesTXN )
{ {
@@ -1178,9 +1182,13 @@ void wxTextCtrl::WriteText(const wxString& text)
{ {
wxString value ; wxString value ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakeMacStringFromPC( text ) ; value = wxMacMakeMacStringFromPC( text ) ;
value.Replace( "\n", "\r" );
}
else else
value = text ; value = text ;
if ( !m_macUsesTXN ) if ( !m_macUsesTXN )
{ {
TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ; TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;

12
src/mac/textctrl.cpp
View File

@@ -785,11 +785,13 @@ wxString wxTextCtrl::GetValue() const
wxString value; wxString value;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakePCStringFromMac( wxBuffer ) ; value = wxMacMakePCStringFromMac( wxBuffer ) ;
value.Replace( "\r", "\n" );
}
else else
value = wxBuffer; value = wxBuffer;
value.Replace( "\r", "\n" );
return value; return value;
} }
@@ -812,11 +814,13 @@ void wxTextCtrl::SetValue(const wxString& st)
wxString value; wxString value;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakeMacStringFromPC( st ) ; value = wxMacMakeMacStringFromPC( st ) ;
value.Replace( "\n", "\r" );
}
else else
value = st; value = st;
value.Replace( "\n", "\r" );
if ( !m_macUsesTXN ) if ( !m_macUsesTXN )
{ {
@@ -1178,9 +1182,13 @@ void wxTextCtrl::WriteText(const wxString& text)
{ {
wxString value ; wxString value ;
if( wxApp::s_macDefaultEncodingIsPC ) if( wxApp::s_macDefaultEncodingIsPC )
{
value = wxMacMakeMacStringFromPC( text ) ; value = wxMacMakeMacStringFromPC( text ) ;
value.Replace( "\n", "\r" );
}
else else
value = text ; value = text ;
if ( !m_macUsesTXN ) if ( !m_macUsesTXN )
{ {
TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ; TEInsert( value , value.Length() , ((TEHandle) m_macTE) ) ;