Author: jpobst
Date: 2007-07-19 16:29:46 -0400 (Thu, 19 Jul 2007)
New Revision: 82323
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2007-07-19 Jonathan Pobst <[EMAIL PROTECTED]>
* TreeNode.cs: Add some corcompare attributes.
* TreeNodeCollection.cs: Implement 2.0 stuffs.
* TreeView.cs: Implement some 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-07-19 20:16:44 UTC (rev 82322)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-19 20:29:46 UTC (rev 82323)
@@ -1,3 +1,9 @@
+2007-07-19 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * TreeNode.cs: Add some corcompare attributes.
+ * TreeNodeCollection.cs: Implement 2.0 stuffs.
+ * TreeView.cs: Implement some 2.0 stuffs.
+
2007-07-18 Andreia Gaita <[EMAIL PROTECTED]>
* WebBrowser.cs, WebBrowserBase.cs: add some more MonoTODOs now
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2007-07-19 20:16:44 UTC (rev 82322)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNode.cs
2007-07-19 20:29:46 UTC (rev 82323)
@@ -343,6 +343,7 @@
[Localizable(true)]
[DefaultValue ("")]
[RelatedImageList ("TreeView.ImageList")]
+ [TypeConverter (typeof (TreeViewImageKeyConverter))]
[RefreshProperties (RefreshProperties.Repaint)]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " +
Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
public string ImageKey {
@@ -564,6 +565,7 @@
[Localizable (true)]
[DefaultValue ("")]
[RelatedImageList ("TreeView.ImageList")]
+ [TypeConverter (typeof (TreeViewImageKeyConverter))]
[RefreshProperties (RefreshProperties.Repaint)]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " +
Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
public string SelectedImageKey {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
2007-07-19 20:16:44 UTC (rev 82322)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
2007-07-19 20:29:46 UTC (rev 82323)
@@ -101,6 +101,18 @@
}
}
+#if NET_2_0
+ public virtual TreeNode this [string key] {
+ get {
+ for (int i = 0; i < count; i++)
+ if (string.Compare (key, nodes[i].Name,
true) == 0)
+ return nodes[i];
+
+ return null;
+ }
+ }
+#endif
+
public virtual TreeNode Add (string text)
{
TreeNode res = new TreeNode (text);
@@ -208,7 +220,7 @@
return (Array.BinarySearch (nodes, node) > 0);
}
#if NET_2_0
- public bool ContainsKey (string key)
+ public virtual bool ContainsKey (string key)
{
for (int i = 0; i < count; i++) {
if (string.Compare (nodes [i].Name, key, true,
CultureInfo.InvariantCulture) == 0)
@@ -234,7 +246,7 @@
}
#if NET_2_0
- public int IndexOfKey (string key)
+ public virtual int IndexOfKey (string key)
{
for (int i = 0; i < count; i++) {
if (string.Compare (nodes [i].Name, key, true,
CultureInfo.InvariantCulture) == 0)
@@ -242,6 +254,13 @@
}
return -1;
}
+
+ public virtual TreeNode Insert (int index, string text)
+ {
+ TreeNode node = new TreeNode (text);
+ Insert (index, node);
+ return node;
+ }
#endif
public virtual void Insert (int index, TreeNode node)
@@ -256,6 +275,52 @@
SetupNode (node);
}
+#if NET_2_0
+ public virtual TreeNode Insert (int index, string key, string
text)
+ {
+ TreeNode node = new TreeNode (text);
+ node.Name = key;
+ Insert (index, node);
+ return node;
+ }
+
+ public virtual TreeNode Insert (int index, string key, string
text, int imageIndex)
+ {
+ TreeNode node = new TreeNode (text);
+ node.Name = key;
+ node.ImageIndex = imageIndex;
+ Insert (index, node);
+ return node;
+ }
+
+ public virtual TreeNode Insert (int index, string key, string
text, string imageKey)
+ {
+ TreeNode node = new TreeNode (text);
+ node.Name = key;
+ node.ImageKey = imageKey;
+ Insert (index, node);
+ return node;
+ }
+
+ public virtual TreeNode Insert (int index, string key, string
text, int imageIndex, int selectedImageIndex)
+ {
+ TreeNode node = new TreeNode (text, imageIndex,
selectedImageIndex);
+ node.Name = key;
+ Insert (index, node);
+ return node;
+ }
+
+ public virtual TreeNode Insert (int index, string key, string
text, string imageKey, string selectedImageKey)
+ {
+ TreeNode node = new TreeNode (text);
+ node.Name = key;
+ node.ImageKey = imageKey;
+ node.SelectedImageKey = selectedImageKey;
+ Insert (index, node);
+ return node;
+ }
+#endif
+
public void Remove (TreeNode node)
{
if (node == null)
@@ -320,6 +385,16 @@
}
}
+#if NET_2_0
+ public virtual void RemoveByKey (string key)
+ {
+ TreeNode node = this[key];
+
+ if (node != null)
+ Remove (node);
+ }
+#endif
+
private TreeNode GetPrevNode (TreeNode node)
{
OpenTreeNodeEnumerator one = new OpenTreeNodeEnumerator
(node);
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-07-19 20:16:44 UTC (rev 82322)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2007-07-19 20:29:46 UTC (rev 82323)
@@ -33,7 +33,9 @@
namespace System.Windows.Forms {
#if NET_2_0
+ [ComVisible (true)]
[Docking (DockingBehavior.Ask)]
+ [ClassInterface (ClassInterfaceType.AutoDispatch)]
#endif
[DefaultProperty("Nodes")]
[DefaultEvent("AfterSelect")]
@@ -61,6 +63,7 @@
#if NET_2_0
private string image_key;
+ private bool right_to_left_layout;
private string selected_image_key;
#endif
private bool full_row_select;
@@ -232,7 +235,7 @@
[DefaultValue (-1)]
[RelatedImageList ("ImageList")]
[RefreshProperties (RefreshProperties.Repaint)]
- //[TypeConverter (typeof (NoneExcludedImageIndexConverter))]
+ [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
#else
[DefaultValue (0)]
[TypeConverter (typeof (TreeViewImageIndexConverter))]
@@ -323,12 +326,36 @@
get { return nodes; }
}
+#if NET_2_0
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ [DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
+ public new Padding Padding {
+ get { return base.Padding; }
+ set { base.Padding = value; }
+ }
+#endif
+
[DefaultValue("\\")]
public string PathSeparator {
get { return path_separator; }
set { path_separator = value; }
}
+#if NET_2_0
+ [Localizable (true)]
+ [DefaultValue (false)]
+ public virtual bool RightToLeftLayout {
+ get { return right_to_left_layout; }
+ set {
+ if (right_to_left_layout != value) {
+ right_to_left_layout = value;
+ OnRightToLeftLayoutChanged
(EventArgs.Empty);
+ }
+ }
+ }
+#endif
+
[DefaultValue(true)]
public bool Scrollable {
get { return scrollable; }
@@ -343,7 +370,7 @@
#if NET_2_0
[DefaultValue (-1)]
[RelatedImageList ("ImageList")]
- //[TypeConverter (typeof (NoneExcludedImageIndexConverter))]
+ [TypeConverter (typeof (NoneExcludedImageIndexConverter))]
#else
[DefaultValue (0)]
[TypeConverter (typeof (TreeViewImageIndexConverter))]
@@ -582,6 +609,7 @@
[DefaultValue ("")]
[RelatedImageList ("ImageList")]
[RefreshProperties (RefreshProperties.Repaint)]
+ [TypeConverter (typeof (ImageKeyConverter))]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " +
Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
public string ImageKey {
get { return image_key; }
@@ -598,6 +626,7 @@
[DefaultValue ("")]
[RelatedImageList ("ImageList")]
[RefreshProperties (RefreshProperties.Repaint)]
+ [TypeConverter (typeof (ImageKeyConverter))]
[Editor ("System.Windows.Forms.Design.ImageIndexEditor, " +
Consts.AssemblySystem_Design, typeof (System.Drawing.Design.UITypeEditor))]
public string SelectedImageKey {
get { return selected_image_key; }
@@ -939,6 +968,13 @@
if (eh != null)
eh(this, e);
}
+
+ [EditorBrowsable (EditorBrowsableState.Advanced)]
+ protected virtual void OnRightToLeftLayoutChanged (EventArgs e)
{
+ EventHandler eh =
(EventHandler)(Events[RightToLeftLayoutChangedEvent]);
+ if (eh != null)
+ eh (this, e);
+ }
#endif
protected internal virtual void OnAfterCheck (TreeViewEventArgs
e) {
@@ -1992,6 +2028,7 @@
static object DrawNodeEvent = new object ();
static object NodeMouseClickEvent = new object ();
static object NodeMouseDoubleClickEvent = new object();
+ static object RightToLeftLayoutChangedEvent = new object ();
#endif
public event ItemDragEventHandler ItemDrag {
@@ -2065,6 +2102,11 @@
add { Events.AddHandler (NodeMouseDoubleClickEvent,
value); }
remove { Events.RemoveHandler
(NodeMouseDoubleClickEvent, value); }
}
+
+ public event EventHandler RightToLeftLayoutChanged {
+ add { Events.AddHandler (RightToLeftLayoutChangedEvent,
value); }
+ remove { Events.RemoveHandler
(RightToLeftLayoutChangedEvent, value); }
+ }
#endif
[Browsable (false)]
@@ -2074,6 +2116,22 @@
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; }
+ }
+
+ [Browsable (false)]
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ public new event EventHandler PaddingChanged {
+ add { base.PaddingChanged += value; }
+ remove { base.PaddingChanged -= value; }
+ }
+#endif
+
[EditorBrowsable (EditorBrowsableState.Never)]
[Browsable (false)]
public new event PaintEventHandler Paint {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches