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

[CVS User rklochkov]

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

Modified Files:
	defslots.lisp g-type.lisp package.lisp 
Log Message:
added GtkAssistant and GtkBuilder


--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/02/20 16:51:37	1.10
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/defslots.lisp	2012/03/06 01:25:26	1.11
@@ -156,3 +156,16 @@
            (let ((*callback* func))
              (,gtk-name ,class (callback ,cb-name) data))
            (,gtk-name ,class func data))))))
+
+(defmacro set-callback (object setter cb-standard func data destroy-notify)
+  `(let ((func ,func) (data ,data))
+     (if (functionp func)
+         (,setter ,object
+                  (callback ,cb-standard)
+                  func
+                  (callback free-storage))
+         (,setter ,object func data 
+                  (or ,destroy-notify
+                      (if (or (null data) 
+                              (pointerp data) (typep data 'g-object))
+                          (null-pointer) (callback free-storage)))))))
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-type.lisp	2012/01/25 19:15:08	1.5
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/g-type.lisp	2012/03/06 01:25:26	1.6
@@ -73,6 +73,8 @@
   "Assoc: gtk-prefix -> lisp package")
 
 (defun register-package (name package)
+  (check-type name string)
+  (check-type package package)
   (push (cons name package) *gtk-packages*))
 
 
--- /project/gtk-cffi/cvsroot/gtk-cffi/g-object/package.lisp	2012/02/12 17:29:41	1.9
+++ /project/gtk-cffi/cvsroot/gtk-cffi/g-object/package.lisp	2012/03/06 01:25:26	1.10
@@ -1,4 +1,3 @@
-;;;; -*- Mode: lisp; indent-tabs-mode: nil -*-
 ;;;
 ;;; package.lisp --- Package definition for gobject-cffi
 ;;;
@@ -18,6 +17,7 @@
    #:property
    #:properties
    #:gsignal
+   #:connect-flags
    
    #:connect
 
@@ -101,4 +101,5 @@
 
    #:*callback*
    #:foreach
-   #:make-foreach))
+   #:make-foreach
+   #:set-callback))