2005-06-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* ToolboxItemAttribute.cs: fix the fix that was fixed before.

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

diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
index 69c4624f4379f821f6a18f4b574e99f314585b41..5e0ebefa747d2cf3f6da069492007b27aefb0f74 100644 (file)
--- a/mcs/class/System/System.ComponentModel/ChangeLog
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * ToolboxItemAttribute.cs: fix the fix that was fixed before.
+
 2005-06-08  Zoltan Varga  <vargaz@freemail.hu>
 
        * ToolboxItemAttribute.cs: Revert last change as it breaks the build.

diff --git a/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs b/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs
index 698465cb21680a0703cfd12a4aa161c4906508a1..0251012749c66cda3c42c01f68da11c91f14b00d 100644 (file)
--- a/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs
+++ b/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs
@@ -35,7 +35,7 @@ namespace System.ComponentModel
        [AttributeUsage(AttributeTargets.All)]
        public class ToolboxItemAttribute : Attribute
        {
-               private static string defaultItemType = "System.Drawing.Design.ToolboxItem,System.Drawing";
+               static string defaultItemType;
 
                public static readonly ToolboxItemAttribute Default = new ToolboxItemAttribute (defaultItemType);
                public static readonly ToolboxItemAttribute None = new ToolboxItemAttribute (false);
@@ -43,6 +43,11 @@ namespace System.ComponentModel
                private Type itemType;
                private string itemTypeName;
 
+               static ToolboxItemAttribute ()
+               {
+                       defaultItemType = "System.Drawing.Desing.ToolboxItem" + Consts.AssemblySystem_Drawing;
+               }
+
                public ToolboxItemAttribute (bool defaultType)
                {
                        if (defaultType)