**** Merged r40732-r40872 from MCS ****

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms / Panel.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Panel.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Panel.cs
index cb69614c3adab6a1dc3214abb394687c34325a4d..c9c30398173865bd38d08eab3ad015baea3a7a4f 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Panel.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Panel.cs
@@ -26,20 +26,26 @@
 // NOT COMPLETE
 
 using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
 using System.Drawing;
+using System.Runtime.InteropServices;
 
 namespace System.Windows.Forms {
-
+       [DefaultProperty("BorderStyle")]
+       [DefaultEvent("Paint")]
+       [Designer ("System.Windows.Forms.Design.PanelDesigner, " + Consts.AssemblySystem_Design, (string)null)]
        public class Panel : ScrollableControl {
-               private BorderStyle border_style;
-
                #region Constructors & Destructors
                public Panel () {
                        base.TabStop = false;
+                       SetStyle(ControlStyles.Selectable, false);
                }
                #endregion      // Constructors & Destructors
 
                #region Public Instance Properties
+               [DefaultValue(BorderStyle.None)]
+               [DispId(-504)]
                public BorderStyle BorderStyle {
                        get { return border_style; }
                        set {
@@ -50,6 +56,7 @@ namespace System.Windows.Forms {
                        }
                }
 
+               [DefaultValue(false)]
                public new bool TabStop {
                        get { return base.TabStop; }
                        set {
@@ -59,6 +66,9 @@ namespace System.Windows.Forms {
                        }
                }
 
+               [Bindable(false)]
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
                public override string Text {
                        get { return base.Text; }
                        set {
@@ -78,7 +88,7 @@ namespace System.Windows.Forms {
                }
 
                protected override Size DefaultSize {
-                       get { return new Size (200, 100); }
+                       get { return ThemeEngine.Current.PanelDefaultSize; }
                }
                #endregion      // Proteced Instance Properties
 
@@ -92,14 +102,27 @@ namespace System.Windows.Forms {
                #region Protected Instance Methods
                protected override void OnResize(EventArgs e) {\r
                        base.OnResize (e);\r
+                       Invalidate(true);\r
                }\r
 
                #endregion      // Protected Instance Methods
 
                #region Events
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
                public event KeyEventHandler            KeyDown;
+
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
                public event KeyPressEventHandler       KeyPress;
+
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
                public event KeyEventHandler            KeyUp;
+
+               [Browsable(false)]
+               [EditorBrowsable(EditorBrowsableState.Never)]
+               public event EventHandler               TextChanged;
                #endregion
        }
 }