[gtk-cffi-cvs] CVS gtk-cffi/gtk

[CVS User rklochkov]

Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk
In directory tiger.common-lisp.net:/tmp/cvs-serv2958/gtk

Modified Files:
	css-provider.lisp tree-model.lisp window.lisp 
Log Message:
Synced with cffi-objects


--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/css-provider.lisp	2012/01/25 19:15:08	1.2
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/css-provider.lisp	2012/07/29 16:11:54	1.3
@@ -20,7 +20,7 @@
   (css-provider pobject) (file g-file) (g-error object))
 
 (defcfun gtk-css-provider-load-from-path :boolean
-  (css-provider pobject) (path :string) (g-error object))
+  (css-provider pobject) (path cffi-pathname) (g-error object))
 
 (defgeneric css-provider-load (css-provider &key data filename gfile)
   (:method  ((css-provider css-provider) &key data filename gfile)
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp	2012/07/29 15:13:59	1.11
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp	2012/07/29 16:11:54	1.12
@@ -159,14 +159,14 @@
 
 (defmethod model-values
   ((tree-model tree-model) &key
-   (iter (tree-iter tree-model)) col (columns (ensure-list col)))
+   (tree-iter (tree-iter tree-model)) col (columns (ensure-list col)))
   "columns = num0 &optional num1 num2 ..."
   ;(format t "model-values: ~a ~a ~a~%" tree-model tree-iter cols)
   (mapcar
    (lambda (col) 
      (with-g-value ()  
        (gtk-tree-model-get-value tree-model
-                                 iter col *g-value*)))
+                                 tree-iter col *g-value*)))
    columns))
 
 (defcfun gtk-tree-model-get-iter :boolean
--- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window.lisp	2012/02/20 16:51:37	1.4
+++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/window.lisp	2012/07/29 16:11:54	1.5
@@ -40,8 +40,8 @@
   urgency-hint :boolean
   accept-focus :boolean
   focus-on-map :boolean
-  default-icon-list g-list-object
-  default-icon-name :string
+;  default-icon-list g-list-object
+;  default-icon-name :string
   icon pobject
   icon-list g-list-object
   icon-name :string
@@ -52,6 +52,20 @@
   application pobject
   screen pobject)
 
+(defcfun gtk-window-set-icon-from-file :boolean
+  (window pobject) (filename cffi-pathname) (g-error object))
+
+(defmethod (setf icon) ((value pathname) (window window))
+  (setf (icon window) (namestring value)))
+
+(defmethod (setf icon) ((value string) (window window))
+  (with-g-error g-error
+    (unless
+        (gtk-window-set-icon-from-file window value g-error)
+      (cerror "Continue" "Window icon load error: ~a" g-error))))
+
+  
+
 (defcfun gtk-window-set-default-size
   :void (window pobject) (w :int) (h :int))
 
@@ -169,6 +183,21 @@
     (with-foreign-outs-list ((width :int) (height :int)) :ignore
       (gtk-window-get-size window width height))))
 
+(defcfun gtk-window-set-default-icon :void (icon pobject))
+(defcfun gtk-window-set-default-icon-from-file :boolean 
+  (filename cffi-pathname) (g-error object))
+(defgeneric (setf default-icon) (icon)
+  (:method ((icon string))
+    (with-g-error g-error
+      (unless (gtk-window-set-default-icon-from-file icon g-error)
+        (cerror "Continue" "Default icon load error: ~a" g-error))))
+  (:method ((icon pathname))
+    (setf (default-icon) (namestring icon)))
+  (:method (icon)
+    (gtk-window-set-default-icon icon)))
+
+(defcfun gtk-window-set-default-icon-list :void (icons g-list-object))
+
 (init-slots window ((width -1) (height -1) geometry resize)
   (when (or (/= width -1) (/= height -1))
     (let ((sizes (list width height)))