[mcclim-cvs] CVS mcclim/Apps/Listener

thenriksen thenriksen at common-lisp.net
Sun Jan 6 15:32:12 UTC 2008


Update of /project/mcclim/cvsroot/mcclim/Apps/Listener
In directory clnet:/tmp/cvs-serv6587/Apps/Listener

Modified Files:
	icons.lisp 
Log Message:
Changed CLIM Listener to use MCCLIM-IMAGES:LOAD-IMAGE instead of
CLIM-INTERNALS::XPM-PARSE-FILE.


--- /project/mcclim/cvsroot/mcclim/Apps/Listener/icons.lisp	2006/03/29 10:43:37	1.5
+++ /project/mcclim/cvsroot/mcclim/Apps/Listener/icons.lisp	2008/01/06 15:32:11	1.6
@@ -34,7 +34,7 @@
 
 (defmacro deficon (var pathname)
   `(eval-when (:load-toplevel :execute)
-     (defparameter ,var (climi::xpm-parse-file ,(merge-pathnames pathname *icon-path*)))))
+     (defparameter ,var (mcclim-images:load-image ,(merge-pathnames pathname *icon-path*)))))
 
 (defvar *icon-cache* (make-hash-table  :test #'equal))
 
@@ -42,8 +42,9 @@
   "Loads an icon from the *icon-path*, caching it by name in *icon-cache*"
   (or (gethash filename *icon-cache*)
       (setf (gethash filename *icon-cache*)
-            (climi::xpm-parse-file (merge-pathnames (parse-namestring filename)
-                                                    *icon-path*)))))
+            (mcclim-images:load-image
+             (merge-pathnames (parse-namestring filename)
+                              *icon-path*)))))
 
 ;; Don't particularly need these any more..
 (deficon *folder-icon*   #P"folder.xpm")




More information about the Mcclim-cvs mailing list