Author: jpobst
Date: 2007-06-06 15:04:32 -0400 (Wed, 06 Jun 2007)
New Revision: 78780
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
Log:
2007-06-06 Jonathan Pobst <[EMAIL PROTECTED]>
* Splitter.cs: Add 2.0 stuffs.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-06-06 18:50:55 UTC (rev 78779)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-06-06 19:04:32 UTC (rev 78780)
@@ -1,5 +1,9 @@
2007-06-06 Jonathan Pobst <[EMAIL PROTECTED]>
+ * Splitter.cs: Add 2.0 stuffs.
+
+2007-06-06 Jonathan Pobst <[EMAIL PROTECTED]>
+
* SplitContainer.cs: Apply patch from Neil Cawse <[EMAIL PROTECTED]>
to have BindingContext simply use base implementation.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2007-06-06 18:50:55 UTC (rev 78779)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Splitter.cs
2007-06-06 19:04:32 UTC (rev 78780)
@@ -35,6 +35,10 @@
using System.Runtime.InteropServices;
namespace System.Windows.Forms {
+#if NET_2_0
+ [ComVisible (true)]
+ [ClassInterface (ClassInterfaceType.AutoDispatch)]
+#endif
[DefaultEvent("SplitterMoved")]
[Designer("System.Windows.Forms.Design.SplitterDesigner, " +
Consts.AssemblySystem_Design, "System.ComponentModel.Design.IDesigner")]
[DefaultProperty("Dock")]
@@ -135,6 +139,15 @@
}
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public override ImageLayout BackgroundImageLayout {
+ get { return base.BackgroundImageLayout; }
+ set { base.BackgroundImageLayout = value; }
+ }
+#endif
+
[DispId(-504)]
[DefaultValue (BorderStyle.None)]
[MWFDescription("Sets the border style for the splitter")]
@@ -325,6 +338,12 @@
}
}
+#if NET_2_0
+ protected override Cursor DefaultCursor {
+ get { return base.DefaultCursor; }
+ }
+#endif
+
protected override ImeMode DefaultImeMode {
get {
return ImeMode.Disable;
@@ -681,6 +700,17 @@
remove { base.BackgroundImageChanged -= value; }
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public new event EventHandler BackgroundImageLayoutChanged
+ {
+ add { base.BackgroundImageLayoutChanged += value; }
+ remove { base.BackgroundImageLayoutChanged -= value; }
+ }
+
+#endif
+
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event EventHandler Enter {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
