Fix Window.setIconImages. Now all images are used. Before only the first image was used.

awt/awt.build

@@ -37,6 +37,7 @@
                 <include name="fonts-0.95.cs" />
                 <include name="graphics.cs" />
                 <include name="composite.cs" />
+                <include name="IconFactory.cs" />
                 <include name="images.cs" />
                 <include name="native.cs" />
             	<include name="printing.cs" />

awt/toolkit-0.95.cs

@@ -4117,26 +4117,21 @@ namespace ikvm.awt
 
         public void updateIconImages()
         {
-            java.util.List imageList = ((java.awt.Window) target).getIconImages();
+            java.util.List imageList = ((java.awt.Window)target).getIconImages();
-            Bitmap originalImage;
+            Icon icon;
             if (imageList == null || imageList.size() == 0)
             {
-                originalImage = null;
+                icon = null;
             }
             else
             {
-                java.awt.Image image = (java.awt.Image)imageList.get(0);
+                IconFactory factory = new IconFactory();
-                originalImage = J2C.ConvertImage(image);
+                icon = factory.CreateIcon(imageList, SystemInformation.IconSize);
             }
             NetToolkit.BeginInvoke(delegate
                {
-                   Size iconSize = SystemInformation.IconSize;
+                   ((Form)control).Icon = icon;
-                   using (Bitmap scaleBitmap = originalImage == null ? null : new Bitmap(originalImage, iconSize))
-                   {
-                       ((Form) control).Icon = scaleBitmap == null ? null : Icon.FromHandle(scaleBitmap.GetHicon());
-                   }
                });
-
         }
 
         public void updateMinimumSize()