2006-12-26 Jonathan Pobst <monkey@jpobst.com>

	* ToolStripMenuItem.cs: Add ShortcutDisplayString for Moma.
	* ToolStripStatusLabel.cs: Add Spring for Moma.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 4e3b251a12882ea9449ad203d66c507fe6c1b42c..91071ada69067def35a3c772ab27ae80b112e5bc 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,8 @@
+2006-12-26  Jonathan Pobst  <monkey@jpobst.com>
+
+       * ToolStripMenuItem.cs: Add ShortcutDisplayString for Moma.
+       * ToolStripStatusLabel.cs: Add Spring for Moma.
+
 2006-12-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * DataGridView.cs: Fixed several NullReferenceException in On* methods.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripMenuItem.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripMenuItem.cs
index 2e2f1b5672c01bd070e232227b36205125495ea4..e3d029cbde0ddb1a3d5163de78cc56d4ff3bbd43 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripMenuItem.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripMenuItem.cs
@@ -37,7 +37,9 @@ namespace System.Windows.Forms
        {
                private CheckState checked_state;
                private bool check_on_click;
+               private string shortcut_display_string;
                private Keys shortcut_keys = Keys.None;
+               private bool show_shortcut_keys = true;
 
                #region Public Constructors
                public ToolStripMenuItem ()
@@ -133,6 +135,20 @@ namespace System.Windows.Forms
                        get { return base.Enabled; }
                        set { base.Enabled = value; }
                }
+
+               [MonoTODO ("Renderer doesn't support shortcut keys yet, they will never show.")]
+               [Localizable (true)]
+               public bool ShowShortcutKeys {
+                       get { return this.show_shortcut_keys; }
+                       set { this.show_shortcut_keys = value; }
+               }
+               
+               [MonoTODO ("Keyboard navigation not implemented.")]
+               [Localizable (true)]
+               public string ShortcutKeyDisplayString {
+                       get { return this.shortcut_display_string; }
+                       set { this.shortcut_display_string = value; }
+               }
                
                [MonoTODO ("Keyboard navigation not implemented.")]
                [Localizable (true)]

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabel.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabel.cs
index b3b410e6ad5b2a82b890fbeb622f15888a8591db..093b6f3ce7b7eebf1de8b72a43952cfecd844ef4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabel.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripStatusLabel.cs
@@ -31,13 +31,16 @@ using System;
 using System.Drawing;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
+using System.Windows.Forms.Design;
 
 namespace System.Windows.Forms
 {
+       [ToolStripItemDesignerAvailability (ToolStripItemDesignerAvailability.StatusStrip)]
        public class ToolStripStatusLabel : ToolStripLabel
        {
                private ToolStripStatusLabelBorderSides border_sides;
                private Border3DStyle border_style;
+               private bool spring;
                
                #region Public Constructors
                public ToolStripStatusLabel ()
@@ -73,20 +76,31 @@ namespace System.Windows.Forms
                #endregion
 
                #region Public Properties
+               [Browsable (false)]
+               [EditorBrowsable (EditorBrowsableState.Never)]
                public new ToolStripItemAlignment Alignment {
                        get { return base.Alignment; }
                        set { base.Alignment = value; }
                }
                
+               [DefaultValue (ToolStripStatusLabelBorderSides.None)]
                public ToolStripStatusLabelBorderSides BorderSides {
                        get { return this.border_sides; }
                        set { this.border_sides = value; }
                }
                
+               [DefaultValue (Border3DStyle.Flat)]
                public Border3DStyle BorderStyle {
                        get { return this.border_style; }
                        set { this.border_style = value; }
                }
+               
+               [MonoTODO ("Stub, doesn't affect sizing yet")]
+               [DefaultValue (false)]
+               public bool Spring {
+                       get { return this.spring; }
+                       set { this.spring = value; }
+               }
                #endregion
 
                #region Protected Properties