Minor change to define-callback

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 7e5c84b48df706b8bf76bdcc7c6ea428da6e8030..980b11678cf2679b5fc70b0283375612c74fdcc9 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkobject.lisp,v 1.34 2006/04/26 10:30:02 espen Exp $
+;; $Id: gtkobject.lisp,v 1.44 2007/09/06 14:22:19 espen Exp $
 
 
 (in-package "GTK")
@@ -29,9 +29,7 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library 
-   #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") 
-                         "/libgtk-x11-2.0.so"))
+  (init-types-in-library gtk "libgtk-2.0")
 
   (defclass %object (gobject)
     ()
@@ -82,6 +80,19 @@ (defun main-iterate-all (&rest args)
   #+clisp 0)
 
 
+(define-callback fd-source-callback-marshal nil 
+    ((callback-id unsigned-int) (fd unsigned-int))
+  (glib::invoke-source-callback callback-id fd))
+
+(defbinding (input-add "gtk_input_add_full") (fd condition function) unsigned-int
+  (fd unsigned-int)
+  (condition gdk:input-condition)
+  (fd-source-callback-marshal callback)
+  (nil null)
+  ((register-callback-function function) unsigned-long)
+  (user-data-destroy-callback callback))
+
+
 ;;;; Metaclass for child classes
  
 (defvar *container-to-child-class-mappings* (make-hash-table))
@@ -135,7 +146,12 @@ (defmethod compute-effective-slot-definition-initargs ((class container-child-cl
        (call-next-method))
     (call-next-method)))
 
-(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition))
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
   (let* ((type (slot-definition-type slotd))
         (pname (slot-definition-pname slotd))
         (reader (reader-function type :ref :get)))
@@ -146,6 +162,10 @@ (defmethod compute-slot-reader-function ((slotd effective-child-slot-definition)
            (%container-child-get-property parent child pname gvalue)
            (funcall reader gvalue +gvalue-value-offset+))))))
 
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
 (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
   (let* ((type (slot-definition-type slotd))
         (pname (slot-definition-pname slotd))
@@ -161,22 +181,24 @@ (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition)
          value))))
 
 
-(defmethod add-reader-method ((class container-child-class) generic-function slot-name)
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class 'widget))
     :lambda-list '(widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
                  (declare (ignore next-methods))
                  (child-property-value (first args) slot-name)))))
 
-(defmethod add-writer-method ((class container-child-class) generic-function slot-name)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class t) (find-class 'widget))
     :lambda-list '(value widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
                  (declare (ignore next-methods))
                  (destructuring-bind (value widget) args
@@ -188,7 +210,7 @@ (defmethod validate-superclass ((class container-child-class) (super standard-cl
   t)
 
 
-(defclass container-child ()
+(defclass container-child (virtual-slots-object)
   ((parent :initarg :parent :type container)
    (child :initarg :child :type widget)))
 
@@ -224,5 +246,33 @@     (defclass ,child-class (,(default-container-child-name super))
           (:metaclass container-child-class)
           (:container ,class))))))
 
+(defun container-child-class (container-class)
+  (gethash container-class *container-to-child-class-mappings*))
+
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)
+
+
+(defmacro define-callback-setter (name arg return-type &rest rest-args)
+  (let ((callback (gensym)))
+    (if arg
+       `(progn 
+          (define-callback-marshal ,callback ,return-type 
+            ,(cons arg rest-args))
+          (defbinding ,name () nil
+            ,arg
+            (,callback callback)
+            (function user-callback)
+            (user-data-destroy-callback callback)))
+      `(progn 
+        (define-callback-marshal ,callback ,return-type ,rest-args)
+        (defbinding ,name () nil
+          (,callback callback)
+          (function user-callback)
+          (user-data-destroy-callback callback))))))
 
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)