From dbf28859114db0126c97c74cb8db5305f400fdf8 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 29 Aug 2000 16:18:39 +0000 Subject: [PATCH] Fixed CanCut git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/textctrl.cpp | 2 +- src/gtk1/textctrl.cpp | 2 +- src/motif/textctrl.cpp | 2 +- src/msw/textctrl.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 29437adb90..4cef1e8168 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -744,7 +744,7 @@ bool wxTextCtrl::CanCut() const // Can cut if there's a selection long from, to; GetSelection(& from, & to); - return (from != to) ; + return (from != to) && (IsEditable()); } bool wxTextCtrl::CanPaste() const diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 29437adb90..4cef1e8168 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -744,7 +744,7 @@ bool wxTextCtrl::CanCut() const // Can cut if there's a selection long from, to; GetSelection(& from, & to); - return (from != to) ; + return (from != to) && (IsEditable()); } bool wxTextCtrl::CanPaste() const diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp index ce98355f14..3a66bd8ff8 100644 --- a/src/motif/textctrl.cpp +++ b/src/motif/textctrl.cpp @@ -304,7 +304,7 @@ bool wxTextCtrl::CanCut() const // Can cut if there's a selection long from, to; GetSelection(& from, & to); - return (from != to) ; + return (from != to) && (IsEditable()); } bool wxTextCtrl::CanPaste() const diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 82f29026b7..0ff8cd4407 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -493,7 +493,7 @@ bool wxTextCtrl::CanCopy() const // Can copy if there's a selection long from, to; GetSelection(& from, & to); - return (from != to); + return (from != to) ; } bool wxTextCtrl::CanCut() const @@ -501,7 +501,7 @@ bool wxTextCtrl::CanCut() const // Can cut if there's a selection long from, to; GetSelection(& from, & to); - return (from != to); + return (from != to) && (IsEditable()); } bool wxTextCtrl::CanPaste() const -- 2.49.0