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

making returns in a line to always be \n (13 in CFM (mpwnewline) and 10 in Mach)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-09-25 19:47:15 +00:00
parent 232ba4c332
commit 395480fb22
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,7 +389,10 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
{ {
// this control draws the border itself // this control draws the border itself
if ( !HasFlag(wxNO_BORDER) ) if ( !HasFlag(wxNO_BORDER) )
{
m_windowStyle &= ~wxSUNKEN_BORDER ; m_windowStyle &= ~wxSUNKEN_BORDER ;
bounds = wxMacGetBoundsForControl( this , pos , size ) ;
}
m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ; m_peer = new wxMacMLTEClassicControl( this , str , pos , size , style ) ;
} }
@@ -764,6 +767,7 @@ void wxTextCtrl::OnEraseBackground(wxEraseEvent& event)
// while this is true for MLTE under classic, the HITextView is somehow // while this is true for MLTE under classic, the HITextView is somehow
// transparent but background erase is not working correctly, so intercept // transparent but background erase is not working correctly, so intercept
// things while we can... // things while we can...
event.Skip() ;
} }
void wxTextCtrl::OnChar(wxKeyEvent& event) void wxTextCtrl::OnChar(wxKeyEvent& event)
@@ -1153,7 +1157,7 @@ wxMacUnicodeTextControl::wxMacUnicodeTextControl( wxWindow *wxPeer,
m_windowStyle = style ; m_windowStyle = style ;
Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
wxMacCFStringHolder cf(st , m_font.GetEncoding()) ; wxMacCFStringHolder cf(st , m_font.GetEncoding()) ;
CFStringRef cfr = cf ; CFStringRef cfr = cf ;
Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ; Boolean isPassword = ( m_windowStyle & wxTE_PASSWORD ) != 0 ;
@@ -1195,13 +1199,17 @@ wxString wxMacUnicodeTextControl::GetStringValue() const
wxMacCFStringHolder cf(value) ; wxMacCFStringHolder cf(value) ;
result = cf.AsString() ; result = cf.AsString() ;
} }
#if TARGET_API_MAC_OSX
wxMacConvertNewlines13To10( &result ) ;
#else
wxMacConvertNewlines10To13( &result ) ; wxMacConvertNewlines10To13( &result ) ;
#endif
return result ; return result ;
} }
void wxMacUnicodeTextControl::SetStringValue( const wxString &str) void wxMacUnicodeTextControl::SetStringValue( const wxString &str)
{ {
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ; wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ; verify_noerr( SetData<CFStringRef>( 0, m_valueTag , cf ) ) ;
} }
@@ -1248,7 +1256,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
void wxMacUnicodeTextControl::WriteText(const wxString& str) void wxMacUnicodeTextControl::WriteText(const wxString& str)
{ {
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ; wxMacCFStringHolder cf(st , m_font.GetEncoding() ) ;
CFStringRef value = cf ; CFStringRef value = cf ;
@@ -1369,14 +1377,19 @@ wxString wxMacMLTEControl::GetStringValue() const
} }
#endif #endif
} }
#if TARGET_API_MAC_OSX
wxMacConvertNewlines13To10( &result ) ;
#else
wxMacConvertNewlines10To13( &result ) ; wxMacConvertNewlines10To13( &result ) ;
#endif
return result ; return result ;
} }
void wxMacMLTEControl::SetStringValue( const wxString &str) void wxMacMLTEControl::SetStringValue( const wxString &str)
{ {
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ;
wxMacConvertNewlines10To13( &st ) ;
EditHelper help(m_txn) ; EditHelper help(m_txn) ;
// wxMacWindowClipper c( this ) ; // wxMacWindowClipper c( this ) ;
@@ -1598,13 +1611,13 @@ long wxMacMLTEControl::GetLastPosition() const
void wxMacMLTEControl::Replace( long from , long to , const wxString str ) void wxMacMLTEControl::Replace( long from , long to , const wxString str )
{ {
wxString value = str ; wxString value = str ;
wxMacConvertNewlines13To10( &value ) ; wxMacConvertNewlines10To13( &value ) ;
EditHelper help( m_txn ) ; EditHelper help( m_txn ) ;
TXNSetSelection(m_txn , from , to ) ; TXNSetSelection(m_txn , from , to ) ;
TXNClear( m_txn ) ; TXNClear( m_txn ) ;
SetTXNData( str , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ; SetTXNData( value , kTXNUseCurrentSelection, kTXNUseCurrentSelection ) ;
} }
void wxMacMLTEControl::Remove( long from , long to ) void wxMacMLTEControl::Remove( long from , long to )
@@ -1634,7 +1647,7 @@ void wxMacMLTEControl::WriteText(const wxString& str)
{ {
EditHelper helper( m_txn ) ; EditHelper helper( m_txn ) ;
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
long start , end , dummy ; long start , end , dummy ;
GetSelection( &start , &dummy ) ; GetSelection( &start , &dummy ) ;
@@ -2343,9 +2356,7 @@ wxMacMLTEClassicControl::wxMacMLTEClassicControl( wxWindow *wxPeer,
m_windowStyle = style ; m_windowStyle = style ;
Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
wxMacConvertNewlines13To10( &st ) ;
short featurSet; short featurSet;
@@ -2478,7 +2489,7 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxWindow *wxPeer,
m_windowStyle = style ; m_windowStyle = style ;
Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ; Rect bounds = wxMacGetBoundsForControl( wxPeer , pos , size ) ;
wxString st = str ; wxString st = str ;
wxMacConvertNewlines13To10( &st ) ; wxMacConvertNewlines10To13( &st ) ;
HIRect hr = { bounds.left , bounds.top , bounds.right - bounds.left , bounds.bottom- bounds.top } ; HIRect hr = { bounds.left , bounds.top , bounds.right - bounds.left , bounds.bottom- bounds.top } ;