ui.images: load images.gdiplus as default image handler on windows

diff --git a/basis/images/gdiplus/gdiplus.factor b/basis/images/gdiplus/gdiplus.factor
index bc5d031820c6629ac04e3407753a421fda181170..95fdc3dd44719e914aee641964350bd07129cbf7 100644 (file)
--- a/basis/images/gdiplus/gdiplus.factor
+++ b/basis/images/gdiplus/gdiplus.factor
@@ -7,14 +7,14 @@ FROM: images => ARGB ;
 IN: images.gdiplus\r
 \r
 SINGLETON: gdi+-image\r
-! "png" gdi+-image register-image-class\r
-! "tif" gdi+-image register-image-class\r
-! "tiff" gdi+-image register-image-class\r
-! "gif" gdi+-image register-image-class\r
-! "jpg" gdi+-image register-image-class\r
-! "jpeg" gdi+-image register-image-class\r
-! "bmp" gdi+-image register-image-class\r
-! "ico" gdi+-image register-image-class\r
+"png" gdi+-image register-image-class\r
+"tif" gdi+-image register-image-class\r
+"tiff" gdi+-image register-image-class\r
+"gif" gdi+-image register-image-class\r
+"jpg" gdi+-image register-image-class\r
+"jpeg" gdi+-image register-image-class\r
+"bmp" gdi+-image register-image-class\r
+"ico" gdi+-image register-image-class\r
 \r
 <PRIVATE\r
 : <GpRect> ( x y w h -- rect )\r

diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor
index e9c527a3a60470e4cd214b9985a1dbb6499423d9..7084f1aac1813b95da29c51ec6ef6e3bf4e0c7c8 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -33,9 +33,8 @@ PRIVATE>
 
 <<
 {
-    { [ os macosx? ] [
-        "images.cocoa" require
-    ] }
+    { [ os macosx? ] [ "images.cocoa"   require ] }
+    { [ os winnt?  ] [ "images.gdiplus" require ] }
     [
         "images.png" require
         "images.tiff" require