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

When saving the editable state, use the real state (m_editable)

Browse Source 
Same change as 1.53 -> 1.54


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-04-14 18:51:54 +00:00
parent fad7abc046
commit 9d5aa5d876
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,7 +849,7 @@ void wxTextCtrl::SetValue(const wxString& st)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
@@ -871,7 +871,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{ {
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNTypeAttributes typeAttr[4] ; TXNTypeAttributes typeAttr[4] ;
@@ -1134,7 +1134,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1160,7 +1160,7 @@ void wxTextCtrl::Remove(long from, long to)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1229,7 +1229,7 @@ void wxTextCtrl::WriteText(const wxString& text)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
long start , end , dummy ; long start , end , dummy ;

10
src/mac/textctrl.cpp
View File

@@ -849,7 +849,7 @@ void wxTextCtrl::SetValue(const wxString& st)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(), TXNSetData( ((TXNObject) m_macTXN), kTXNTextData, (void*)value.c_str(), value.Length(),
@@ -871,7 +871,7 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{ {
if ( m_macUsesTXN ) if ( m_macUsesTXN )
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNTypeAttributes typeAttr[4] ; TXNTypeAttributes typeAttr[4] ;
@@ -1134,7 +1134,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1160,7 +1160,7 @@ void wxTextCtrl::Remove(long from, long to)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ; TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1229,7 +1229,7 @@ void wxTextCtrl::WriteText(const wxString& text)
} }
else else
{ {
bool formerEditable = IsEditable() ; bool formerEditable = m_editable ;
if ( !formerEditable ) if ( !formerEditable )
SetEditable(true) ; SetEditable(true) ;
long start , end , dummy ; long start , end , dummy ;