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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 5f71de9973b194c461a2d6b70e41bc646372401a..852aa49750da80b291a6195fa10cbedd92b85d0a 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -859,7 +859,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE
         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE


@@ -887,7 +887,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 )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;


@@ -1150,7 +1150,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;


@@ -1181,7 +1181,7 @@ void wxTextCtrl::Remove(long from, long to)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;


@@ -1242,7 +1242,7 @@ void wxTextCtrl::WriteText(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;
         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;

diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 5f71de9973b194c461a2d6b70e41bc646372401a..852aa49750da80b291a6195fa10cbedd92b85d0a 100644 (file)
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -859,7 +859,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE
         if ( !formerEditable )
             SetEditable(true) ;
 #if wxUSE_UNICODE


@@ -887,7 +887,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 )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;


@@ -1150,7 +1150,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;


@@ -1181,7 +1181,7 @@ void wxTextCtrl::Remove(long from, long to)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;


@@ -1242,7 +1242,7 @@ void wxTextCtrl::WriteText(const wxString& st)
     }
     else
     {
     }
     else
     {

-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;

         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;
         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;