Applied patch in #12279: in wxRichTextCtrl, when wxRE_READONLY is set, the undo,...

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

diff --git a/src/richtext/richtextctrl.cpp b/src/richtext/richtextctrl.cpp
index 08f62df425ead925a73c8cb58391ee38cc666709..cbe4d43fc8b06a0dd476f22f699485953e36ae7c 100644 (file)
--- a/src/richtext/richtextctrl.cpp
+++ b/src/richtext/richtextctrl.cpp
@@ -3012,12 +3012,12 @@ void wxRichTextCtrl::Redo()
 
 bool wxRichTextCtrl::CanUndo() const
 {
 
 bool wxRichTextCtrl::CanUndo() const
 {

-    return GetCommandProcessor()->CanUndo();
+    return GetCommandProcessor()->CanUndo() && IsEditable();

 }
 
 bool wxRichTextCtrl::CanRedo() const
 {
 }
 
 bool wxRichTextCtrl::CanRedo() const
 {

-    return GetCommandProcessor()->CanRedo();
+    return GetCommandProcessor()->CanRedo() && IsEditable();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------