Fixed CanCut

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 29437adb9052cc44037c1ab5a8e1ab69ed58d399..4cef1e816857c61ced6274a5fbd63cf4ba8d9a12 100644 (file)
--- 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);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to) ;
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 29437adb9052cc44037c1ab5a8e1ab69ed58d399..4cef1e816857c61ced6274a5fbd63cf4ba8d9a12 100644 (file)
--- 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);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to) ;
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ce98355f14467e143f7180b3a490fe9bca16cd5c..3a66bd8ff8a6661ecacf9abedfb47e1610558110 100644 (file)
--- 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);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to) ;
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 82f29026b7c9e798d952c739e995f2841ddf0492..0ff8cd44072ce49697b7be7ba17fa900341b93e9 100644 (file)
--- 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);
     // Can copy if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to);
+    return (from != to) ;

 }
 
 bool wxTextCtrl::CanCut() const
 }
 
 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);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to);
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const