From 9d5aa5d876355947bb37fb95d67fd89f58c26a20 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Mon, 14 Apr 2003 18:51:54 +0000
Subject: [PATCH] When saving the editable state, use the real state
 (m_editable) 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
---
 src/mac/carbon/textctrl.cpp | 10 +++++-----
 src/mac/textctrl.cpp        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 5e04b0e4de..f73a2e130c 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -849,7 +849,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         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 )
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;
@@ -1134,7 +1134,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1160,7 +1160,7 @@ void wxTextCtrl::Remove(long from, long to)
   }
   else
   {
-    bool formerEditable = IsEditable() ;
+    bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1229,7 +1229,7 @@ void wxTextCtrl::WriteText(const wxString& text)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;
diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp
index 5e04b0e4de..f73a2e130c 100644
--- a/src/mac/textctrl.cpp
+++ b/src/mac/textctrl.cpp
@@ -849,7 +849,7 @@ void wxTextCtrl::SetValue(const wxString& st)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         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 )
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNTypeAttributes typeAttr[4] ;
@@ -1134,7 +1134,7 @@ void wxTextCtrl::Replace(long from, long to, const wxString& value)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1160,7 +1160,7 @@ void wxTextCtrl::Remove(long from, long to)
   }
   else
   {
-    bool formerEditable = IsEditable() ;
+    bool formerEditable = m_editable ;
     if ( !formerEditable )
         SetEditable(true) ;
     TXNSetSelection( ((TXNObject) m_macTXN) , from , to ) ;
@@ -1229,7 +1229,7 @@ void wxTextCtrl::WriteText(const wxString& text)
     }
     else
     {
-        bool formerEditable = IsEditable() ;
+        bool formerEditable = m_editable ;
         if ( !formerEditable )
             SetEditable(true) ;
         long start , end , dummy ;