Author: kostat
Date: 2005-11-28 09:48:28 -0500 (Mon, 28 Nov 2005)
New Revision: 53559
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs
Log:
merge -r 53557:53558
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
2005-11-28 14:47:28 UTC (rev 53558)
+++ branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/ChangeLog
2005-11-28 14:48:28 UTC (rev 53559)
@@ -1,5 +1,9 @@
2005-11-28 Konstantin Triger <[EMAIL PROTECTED]>
+ * SystemIcons.jvm.cs: refactoring.
+
+2005-11-28 Konstantin Triger <[EMAIL PROTECTED]>
+
* Icon.cs: TARGET_JVM changes.
2005-11-17 Vladimir Krasnov <[EMAIL PROTECTED]>
Modified:
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs
===================================================================
---
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs
2005-11-28 14:47:28 UTC (rev 53558)
+++
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing/SystemIcons.jvm.cs
2005-11-28 14:48:28 UTC (rev 53559)
@@ -38,7 +38,7 @@
namespace System.Drawing {
public sealed class SystemIcons {
- static readonly ArrayList systemIcons;
+ static readonly Icon[] systemIcons;
enum IconName {
Application, Asterisk, Error,
@@ -50,24 +50,24 @@
Type nameType = typeof(IconName);
string [] iconNames = Enum.GetNames(nameType);
- systemIcons = new ArrayList(iconNames.Length);
+ systemIcons = new Icon[iconNames.Length];
Assembly assembly = Assembly.GetExecutingAssembly();
for (int i = 0; i < iconNames.Length; i++)
-
systemIcons.Insert((int)(IconName)Enum.Parse(nameType, iconNames[i]),
- new
Icon(assembly.GetManifestResourceStream(String.Format("System.Drawing.Assembly.{0}.ico",
iconNames[i]))));
+ systemIcons[(int)(IconName)Enum.Parse(nameType,
iconNames[i])] =
+ new
Icon(assembly.GetManifestResourceStream(String.Format("System.Drawing.Assembly.{0}.ico",
iconNames[i])));
}
private SystemIcons() {
}
- public static Icon Application { get { return
(Icon)systemIcons[(int)IconName.Application];} }
- public static Icon Asterisk { get { return
(Icon)systemIcons[(int)IconName.Asterisk];} }
- public static Icon Error { get { return
(Icon)systemIcons[(int)IconName.Error];} }
- public static Icon Exclamation { get { return
(Icon)systemIcons[(int)IconName.Exclamation];} }
- public static Icon Hand { get { return
(Icon)systemIcons[(int)IconName.Hand];} }
- public static Icon Information { get { return
(Icon)systemIcons[(int)IconName.Information];} }
- public static Icon Question { get { return
(Icon)systemIcons[(int)IconName.Question];} }
- public static Icon Warning { get { return
(Icon)systemIcons[(int)IconName.Warning];} }
- public static Icon WinLogo { get { return
(Icon)systemIcons[(int)IconName.WinLogo];} }
+ public static Icon Application { get { return
systemIcons[(int)IconName.Application];} }
+ public static Icon Asterisk { get { return
systemIcons[(int)IconName.Asterisk];} }
+ public static Icon Error { get { return
systemIcons[(int)IconName.Error];} }
+ public static Icon Exclamation { get { return
systemIcons[(int)IconName.Exclamation];} }
+ public static Icon Hand { get { return
systemIcons[(int)IconName.Hand];} }
+ public static Icon Information { get { return
systemIcons[(int)IconName.Information];} }
+ public static Icon Question { get { return
systemIcons[(int)IconName.Question];} }
+ public static Icon Warning { get { return
systemIcons[(int)IconName.Warning];} }
+ public static Icon WinLogo { get { return
systemIcons[(int)IconName.WinLogo];} }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
