X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/07dafdb05d2142564c1fd14265cf174cb3ab92f3..667cf76b601cf67902e5205066815bffedcba87f:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index bd4385f..980b116 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.42 2007/06/06 10:43:54 espen Exp $ +;; $Id: gtkobject.lisp,v 1.44 2007/09/06 14:22:19 espen Exp $ (in-package "GTK") @@ -80,6 +80,19 @@ #+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)) @@ -243,3 +256,23 @@ (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)))))) +