X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/fb37007601c271878ec48d5714d7dce76518fafc..355283f625ca83ba32d886425e3a702b16d333bd:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 9a31981..0f40e66 100644
--- 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.40 2007-03-12 12:59:22 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." asdf:*dso-extension*))
+  (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))
@@ -238,4 +249,30 @@ 	 (defclass ,child-class (,(default-container-child-name super))
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))
 
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
+(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))))))
+