2005-11-30 Peter Dennis Bartok <pbartok@novell.com>

	* TextBoxBase.cs:  Implemented Ctrl-Ins (Copy), Shift-Ins (Paste) and
	  Shift-Del (Cut), apparently Emacs uses these old Win 2.x keys. This
	  is for Jackson
	* RichTextBox.cs: Added calls to base for DnD events

svn path=/trunk/mcs/; revision=53669

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 46ec50bf5880548da3fd92823aac3d82c94b7bb1..bbceccdba717dffe30c9a2c2a62f1c688fd3b552 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-30  Peter Dennis Bartok  <pbartok@novell.com>
+
+       * TextBoxBase.cs:  Implemented Ctrl-Ins (Copy), Shift-Ins (Paste) and
+         Shift-Del (Cut), apparently Emacs uses these old Win 2.x keys. This
+         is for Jackson
+       * RichTextBox.cs: Added calls to base for DnD events
+
 2005-11-28  Peter Dennis Bartok  <pbartok@novell.com>
 
        * TextControl.cs:

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
index 71a6f0019915cb40d0b06f0fc0976ace8103f7ce..f3f717d4339d6030b66a94dd82d1cc0ee02f87ff 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RichTextBox.cs
@@ -960,19 +960,53 @@ Console.WriteLine("FIXME - SelectionColor should not alter font");
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler                   DragDrop;
+               public event DragEventHandler DragDrop {
+                       add {
+                               base.DragDrop += value;
+                       }
+
+                       remove {
+                               base.DragDrop -= value;
+                       }
+               }
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler                   DragEnter;
+               public event DragEventHandler DragEnter {
+                       add {
+                               base.DragEnter += value;
+                       }
+
+                       remove {
+                               base.DragEnter -= value;
+                       }
+               }
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event EventHandler                       DragLeave;
+               public event EventHandler DragLeave {
+                       add {
+                               base.DragLeave += value;
+                       }
+
+                       remove {
+                               base.DragLeave -= value;
+                       }
+               }
+
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]
-               public event DragEventHandler                   DragOver;
+               public event DragEventHandler DragOver {
+                       add {
+                               base.DragOver += value;
+                       }
+
+                       remove {
+                               base.DragOver -= value;
+                       }
+               }
+
 
                [Browsable(false)]
                [EditorBrowsable(EditorBrowsableState.Never)]

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
index 7f927519a8f876a95b87c3ff16feea9dfe2597b3..a7cb9b859b092a194c392068b728bc6da05d7eec 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
@@ -962,7 +962,27 @@ namespace System.Windows.Forms {
                                        return true;
                                }
 
+                               case Keys.Insert: {
+                                       if (shift) {
+                                               Paste();
+                                               return true;
+                                       }
+
+                                       if (control) {
+                                               Copy();
+                                               return true;
+                                       }
+
+                                       // FIXME - need overwrite/insert toggle?
+                                       return false;
+                               }
+
                                case Keys.Delete: {
+                                       if (shift) {
+                                               Cut();
+                                               return true;
+                                       }
+
                                        if (read_only) {
                                                break;
                                        }