Author: mhutch
Date: 2007-10-03 18:26:26 -0400 (Wed, 03 Oct 2007)
New Revision: 86835
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
Log:
* MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs: Implement
IComparable so that the ToolboxService's array sort doesn't break
on non-GTK#-component toolbox nodes. Fixes AspNetEdit.
Modified: trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2007-10-03 21:43:58 UTC (rev 86834)
+++ trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/ChangeLog
2007-10-03 22:26:26 UTC (rev 86835)
@@ -1,3 +1,9 @@
+2007-10-03 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs: Implement
+ IComparable so that the ToolboxService's array sort doesn't break on
+ non-GTK#-component toolbox nodes. Fixes AspNetEdit.
+
2007-09-21 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.DesignerSupport.addin.xml: Bump MD version.
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
2007-10-03 21:43:58 UTC (rev 86834)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ItemToolboxNode.cs
2007-10-03 22:26:26 UTC (rev 86835)
@@ -44,7 +44,7 @@
{
[DataItem (Name = "item", FallbackType = typeof(UnknownToolboxNode))]
[Serializable]
- public abstract class ItemToolboxNode : BaseToolboxNode, ICustomDataItem
+ public abstract class ItemToolboxNode : BaseToolboxNode,
ICustomDataItem, IComparable<ItemToolboxNode>
{
[NonSerialized]
Gdk.Pixbuf icon;
@@ -124,6 +124,15 @@
return (node != null) && (node.Name == this.Name) &&
(node.Category == this.Category) && (node.Description == this.Description);
}
+ public virtual int CompareTo (ItemToolboxNode other)
+ {
+ if (other == null) return -1;
+ if (Category == other.Category)
+ return Name.CompareTo (other.Name);
+ else
+ return Category.CompareTo (other.Category);
+ }
+
#endregion Behaviours
Modified:
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
===================================================================
---
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
2007-10-03 21:43:58 UTC (rev 86834)
+++
trunk/monodevelop/Extras/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.mdp
2007-10-03 22:26:26 UTC (rev 86835)
@@ -117,6 +117,7 @@
<ProjectReference type="Gac" localcopy="True" refto="gdk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<ProjectReference type="Gac" localcopy="True" refto="gtk-sharp,
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</References>
+ <GtkDesignInfo gtkVersion="2.8.3" />
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../">
<BuildFilesVar Sync="True" Name="FILES" />
<DeployFilesVar />
@@ -126,7 +127,6 @@
<AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
<ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
</MonoDevelop.Autotools.MakefileInfo>
- <GtkDesignInfo gtkVersion="2.8.3" />
<MonoDevelop.Gettext.TranslationInfo />
<DeploymentInformation strategy="File">
<excludeFiles />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
