X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/f36ca6af731aaec31d2ee56ec1cb19ce6cf8d835..60e5d93717c275307c88ff03cca7492e8c775d72:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 7dce09d..85eced1 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2000 Espen S. Johnsen <espejohn@online.no>
+;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -15,19 +15,19 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtk.lisp,v 1.2 2000-09-04 22:23:34 espen Exp $
+;; $Id: gtk.lisp,v 1.19 2004-11-21 17:39:27 espen Exp $
 
 
 (in-package "GTK")
 
 ;;; Gtk version
 
-(define-foreign check-version () string
+(defbinding check-version () (copy-of string)
   (required-major unsigned-int)
   (required-minor unsigned-int)
   (required-micro unsigned-int))
 
-(define-foreign query-version () nil
+(defbinding query-version () nil
   (major unsigned-int :out)
   (minor unsigned-int :out)
   (micro unsigned-int :out))
@@ -39,798 +39,799 @@
 	(format nil "Gtk+ v~A.~A" major minor) 
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
+(defbinding get-default-language () (copy-of pango:language))
 
 
-;;; should be moved to gobject
-
+;;;; Initalization
 
+(defbinding (gtk-init "gtk_parse_args") () nil
+  "Initializes the library without opening the display."
+  (nil null)
+  (nil null))
 
-;;; Label
+(defun clg-init (&optional display)
+  "Initializes the system and starts the event handling"
+  (unless (gdk:display-get-default)
+    (gdk:gdk-init)
+    (gtk-init)
+    (prog1
+	(gdk:display-open display)
+      (system:add-fd-handler 
+       (gdk:display-connection-number) :input #'main-iterate-all)
+      (setq lisp::*periodic-polling-function* #'main-iterate-all)
+      (setq lisp::*max-event-to-sec* 0)
+      (setq lisp::*max-event-to-usec* 1000))))
 
-(define-foreign label-new () label
-  (text string))
 
-(define-foreign label-parse-uline () unsigned-int
-  (label label)
-  (string string))
+;;; Acccel group
 
 
 
 ;;; Acccel label
 
-(define-foreign accel-label-new () accel-label
-  (text string))
-
-(define-foreign accel-label-refetch () boolean
+(defbinding accel-label-refetch () boolean
   (accel-label accel-label))
 
 
+;;; Adjustment
 
-;;; Tips query
-
-(define-foreign tips-query-new () tips-query)
-
-(define-foreign tips-query-start-query () nil
-  (tips-query tips-query))
-
-(define-foreign tips-query-stop-query () nil
-  (tips-query tips-query))
+(defmethod shared-initialize ((adjustment adjustment) names &key value)
+  (prog1
+      (call-next-method)
+    ;; we need to make sure that the value is set last, otherwise it
+    ;; may be outside current limits
+    (when value
+      (setf (slot-value adjustment 'value) value))))
 
 
+(defbinding adjustment-changed () nil
+  (adjustment adjustment))
 
-;;; Arrow
+(defbinding adjustment-value-changed () nil
+  (adjustment adjustment))
 
-(define-foreign arrow-new () arrow
-  (arrow-type arrow-type)
-  (shadow-type shadow-type))
+(defbinding adjustment-clamp-page () nil
+  (adjustment adjustment)
+  (lower single-float)
+  (upper single-float))
 
 
+;;; Arrow -- no functions
 
-;;; Pixmap
 
-(defmethod initialize-instance ((pixmap pixmap) &rest initargs
-				&key source mask)
-  (declare (ignore initargs))
-  (call-next-method)
-  (if (typep source 'gdk:pixmap)
-      (pixmap-set pixmap source mask)
-    (multiple-value-bind (source mask) (gdk:pixmap-create source)
-      (pixmap-set pixmap source mask))))
-
-(defun pixmap-new (source &optional mask)
-  (make-instance 'pixmap :source source :mask mask))
-
-(define-foreign pixmap-set () nil
-  (pixmap pixmap)
-  (source gdk:pixmap)
-  (mask (or null gdk:bitmap)))
-
-(defun (setf pixmap-source) (source pixmap)
-  (if (typep source 'gdk:pixmap)
-      (pixmap-set pximap source (pixmap-mask pixmap))
-    (multiple-value-bind (source mask) (gdk:pixmap-create source)
-      (pixmap-set pixmap source mask)))
-  source)
-
-(defun (setf pixmap-mask) (mask pixmap)
-  (pixmap-set pximap (pixmap-source pixmap) mask)
-  mask)
-    
-(define-foreign ("gtk_pixmap_get" pixmap-source) () nil
-  (pixmap pixmap)
-  (val gdk:pixmap :out)
-  (nil null))
-
-(define-foreign ("gtk_pixmap_get" pixmap-mask) () nil
-  (pixmap pixmap)
-  (nil null)
-  (mask gdk:bitmap :out))
 
+;;; Aspect frame
 
 
 ;;; Bin
 
-(defun bin-child (bin)
-  (first (container-children bin)))
-
 (defun (setf bin-child) (child bin)
-  (let ((old-child (bin-child bin)))
-    (when old-child
-      (container-remove bin old-child)))
+  (when-bind (current-child (bin-child bin))
+    (container-remove bin current-child))
   (container-add bin child)
   child)
 
 
+;;; Binding
 
-;;; Alignment
-
-(define-foreign alignment-new () alignment
-  (xalign single-float)
-  (ylign single-float)
-  (xscale single-float)
-  (yscale single-float))
 
 
+;;; Box
 
-;;; Frame
+(defbinding box-pack-start () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int))
 
-(define-foreign frame-new (&optional label) frame
-  (label string))
+(defbinding box-pack-end () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int))
 
+(defun box-pack (box child &key end expand fill (padding 0))
+  (if end
+      (box-pack-end box child expand fill padding)
+    (box-pack-start box child expand fill padding)))
 
+(defbinding box-reorder-child () nil
+  (box box)
+  (child widget)
+  (position int))
 
-;;; Aspect frame
+(defbinding box-query-child-packing () nil
+  (box box)
+  (child widget)
+  (expand boolean :out)
+  (fill boolean :out)
+  (padding unsigned-int :out)
+  (pack-type pack-type :out))
 
-(define-foreign aspect-frame-new () alignment
-  (xalign single-float)
-  (ylign single-float)
-  (ratio single-float)
-  (obey-child boolean))
+(defbinding box-set-child-packing () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int)
+  (pack-type pack-type))
 
 
 
 ;;; Button
 
-(define-foreign %button-new () button)
-
-(define-foreign %button-new-with-label () button
-  (label string))
-
-(defun button-new (&optional label)
-  (if label
-      (%button-new-with-label label)
-    (%button-new)))
-
-(defgeneric button-label (button))
-(defgeneric (setf button-label) (label button))
-
-(defmethod button-label ((button button))
-  (object-arg button "GtkButton::label"))
-
-(defmethod (setf button-label) ((label string) (button button))
-  (setf (object-arg button "GtkButton::label") label))
-
-
-(define-foreign button-pressed () nil
+(defbinding button-pressed () nil
   (button button))
 
-(define-foreign button-released () nil
+(defbinding button-released () nil
   (button button))
 
-(define-foreign button-clicked () nil
+(defbinding button-clicked () nil
   (button button))
 
-(define-foreign button-enter () nil
+(defbinding button-enter () nil
   (button button))
 
-(define-foreign button-leave () nil
+(defbinding button-leave () nil
   (button button))
 
 
 
-;;; Toggle button
-
-(define-foreign %toggle-button-new () toggle-button)
-
-(define-foreign %toggle-button-new-with-label () toggle-button
-  (label string))
-
-(defun toggle-button-new (&optional label)
-  (if label
-      (%toggle-button-new-with-label label)
-    (%toggle-button-new)))
-
-(define-foreign toggle-button-toggled () nil
-  (toggle-button toggle-button))
+;;; Calendar
 
+(defbinding calendar-select-month () int
+  (calendar calendar)
+  (month unsigned-int)
+  (year unsigned-int))
 
+(defbinding calendar-select-day () nil
+  (calendar calendar)
+  (day unsigned-int))
 
-;;; Check button
+(defbinding calendar-mark-day () int
+  (calendar calendar)
+  (day unsigned-int))
 
-(define-foreign %check-button-new () check-button)
+(defbinding calendar-unmark-day () int
+  (calendar calendar)
+  (day unsigned-int))
 
-(define-foreign %check-button-new-with-label () check-button
-  (label string))
+(defbinding calendar-clear-marks () nil
+  (calendar calendar))
 
-(defun check-button-new (&optional label)
-  (if label
-      (%check-button-new-with-label label)
-    (%check-button-new)))
+(defbinding calendar-display-options () nil
+  (calendar calendar)
+  (options calendar-display-options))
 
-(defmethod (setf button-label) ((label string) (button check-button))
-  (call-next-method)
-  (setf (misc-xalign (bin-child button)) 0.0)
-  label)
+(defbinding (calendar-date "gtk_calendar_get_date") () nil
+  (calendar calendar)
+  (year unsigned-int :out)
+  (month unsigned-int :out)
+  (day unsigned-int :out))
 
+(defbinding calendar-freeze () nil
+  (calendar calendar))
 
+(defbinding calendar-thaw () nil
+  (calendar calendar))
 
-;;; Radio button
 
-(define-foreign %radio-button-new () radio-button
-  (group (or null radio-button-group)))
 
-(define-foreign %radio-button-new-with-label-from-widget () radio-button
-  (widget (or null widget))
-  (label string))
+;;; Cell editable
 
-(define-foreign %radio-button-new-from-widget () radio-button
-  (widget (or null widget)))
 
-(define-foreign %radio-button-new-with-label () radio-button
-  (group (or null radio-button-group))
-  (label string))
 
-(defun radio-button-new (group &key label from-widget)
-  (cond
-   ((and from-widget label)
-    (%radio-button-new-with-label-from-widget group label))
-   (from-widget
-    (%radio-button-new-from-widget group))
-   (label
-    (%radio-button-new-with-label group label))
-   (t
-    (%radio-button-new group))))
-    
-; (define-foreign radio-button-group () radio-button-group
-;   (radio-button radio-button))
+;;; Cell renderer
 
 
 
-;;; Option menu
+;;; Cell renderer pixbuf -- no functions
 
-(define-foreign option-menu-new () option-menu)
 
-(define-foreign %option-menu-set-menu () nil
-  (option-menu option-menu)
-  (menu widget))
 
-(define-foreign %option-menu-remove-menu () nil
-  (option-menu option-menu))
+;;; Cell renderer text
 
-(defun (setf option-menu-menu) (menu option-menu)
-  (if (not menu)
-      (%option-menu-remove-menu option-menu)
-    (%option-menu-set-menu option-menu menu))
-  menu)
-    
 
 
-;;; Item
+;;; Cell renderer toggle -- no functions
 
-(define-foreign item-select () nil
-  (item item))
 
-(define-foreign item-deselect () nil
-  (item item))
 
-(define-foreign item-toggle () nil
-  (item item))
+;;; Check button -- no functions
 
 
 
-;;; Menu item
+;;; Check menu item
 
-(define-foreign %menu-item-new () menu-item)
+(defbinding check-menu-item-toggled () nil
+  (check-menu-item check-menu-item))
 
-(define-foreign %menu-item-new-with-label () menu-item
-  (label string))
 
-(defun menu-item-new (&optional label)
-  (if label
-      (%menu-item-new-with-label label)
-    (%menu-item-new)))
 
-(defun (setf menu-item-label) (label menu-item)
-  (make-instance 'accel-label
-   :label label :xalign 0.0 :yalign 0.5 :accel-widget menu-item
-   :visible t :parent menu-item)
-  label)
+;;; Clipboard
 
-(define-foreign %menu-item-set-submenu () nil
-  (menu-item menu-item)
-  (submenu menu))
 
-(define-foreign %menu-item-remove-submenu () nil
-  (menu-item menu-item))
+;;; Color selection
 
-(defun (setf menu-item-submenu) (submenu menu-item)
-  (if (not submenu)
-      (%menu-item-remove-submenu menu-item)
-    (%menu-item-set-submenu menu-item submenu))
-  submenu)
+(defbinding (color-selection-is-adjusting-p
+	     "gtk_color_selection_is_adjusting") () boolean
+  (colorsel color-selection))
 
-(define-foreign %menu-item-configure () nil
-  (menu-item menu-item)
-  (show-toggle-indicator boolean)
-  (show-submenu-indicator boolean))
-
-(defun (setf menu-item-toggle-indicator-p) (show menu-item)
-  (%menu-item-configure
-   menu-item
-   show
-   (menu-item-submenu-indicator-p menu-item))
-  show)
-
-(defun (setf menu-item-submenu-indicator-p) (show menu-item)
-  (%menu-item-configure
-   menu-item
-   (menu-item-toggle-indicator-p menu-item)
-   show))
-
-(define-foreign menu-item-select () nil
-  (menu-item menu-item))
 
-(define-foreign menu-item-deselect () nil
-  (menu-item menu-item))
 
-(define-foreign menu-item-activate () nil
-  (menu-item menu-item))
+;;; Color selection dialog -- no functions
 
-(define-foreign menu-item-right-justify () nil
-  (menu-item menu-item))
 
 
+;;;; Combo Box
 
-;;; Check menu item
+(defmethod shared-initialize ((combo-box combo-box) names &key model content)
+  (unless model
+    (setf 
+     (combo-box-model combo-box) 
+     (make-instance 'list-store :column-types '(string)))
+    (unless (typep combo-box 'combo-box-entry)
+      (let ((cell (make-instance 'cell-renderer-text)))
+	(cell-layout-pack combo-box cell :expand t)
+	(cell-layout-add-attribute combo-box cell :text 0)))
+    (when content
+      (map 'nil #'(lambda (text)
+		    (combo-box-append-text combo-box text))
+	   content)))
+    (call-next-method))
 
-(define-foreign %check-menu-item-new
-    () check-menu-item)
+;; (defmethod shared-initialize :after ((combo-box combo-box) names &key active)
+;;   (when active
+;;     (signal-emit combo-box 'changed)))
 
-(define-foreign %check-menu-item-new-with-label () check-menu-item
-  (label string))
+(defbinding combo-box-append-text () nil
+  (combo-box combo-box)
+  (text string))
 
-(defun check-menu-item-new (&optional label)
-  (if label
-      (%check-menu-item-new-with-label label)
-    (%check-menu-item-new)))
+(defbinding combo-box-insert-text () nil
+  (combo-box combo-box)
+  (position int)
+  (text string))
 
-(define-foreign check-menu-item-toggled () nil
-  (check-menu-item check-menu-item))
+(defbinding combo-box-prepend-text () nil
+  (combo-box combo-box)
+  (text string))
 
+#+gtk2.6
+(defbinding combo-box-get-active-text () string
+  (combo-box combo-box))
 
+(defbinding combo-box-popup () nil
+  (combo-box combo-box))
 
-;;; Radio menu item
+(defbinding combo-box-popdown () nil
+  (combo-box combo-box))
 
-(define-foreign %radio-menu-item-new
-                 () radio-menu-item
-  (group (or null radio-menu-item-group)))
 
-(define-foreign %radio-menu-item-new-with-label () radio-menu-item
-  (group (or null radio-menu-item-group))
-  (label string))
 
-(defun radio-menu-item-new (group &optional label)
-  (if label
-      (%radio-menu-item-new-with-label group label)
-    (%radio-menu-item-new group)))
+;;;; Combo Box Entry
 
+(defmethod shared-initialize ((combo-box-entry combo-box-entry) names &key model)
+  (call-next-method)
+  (unless model
+    (setf (combo-box-entry-text-column combo-box-entry) 0)))
 
 
-;;; Tearoff menu item
+;;;; Dialog
 
-(define-foreign tearoff-menu-item-new () tearoff-menu-item)
+(defmethod shared-initialize ((dialog dialog) names &rest initargs &key button)
+  (declare (ignore button))
+  (call-next-method)
+  (dolist (button-definition (get-all initargs :button))
+    (apply #'dialog-add-button dialog (mklist button-definition))))
+  
 
+(defvar %*response-id-key* (gensym))
 
+(defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
+  (or
+   (cadr (assoc id (rest (type-expand-1 'response-type))))
+   (let ((response-ids (object-data dialog %*response-id-key*)))
+    (cond
+      ((and response-ids (position id response-ids :test #'equal)))
+      (create-p
+       (cond
+	 (response-ids
+	  (vector-push-extend id response-ids)
+	  (1- (length response-ids)))
+	 (t
+	  (setf 
+	   (object-data dialog %*response-id-key*)
+	   (make-array 1 :adjustable t :fill-pointer t :initial-element id))
+	  0)))
+      (error-p
+       (error "Invalid response: ~A" id))))))
+
+(defun %dialog-find-response-id (dialog response-id-num)
+  (if (< response-id-num 0)
+      (car
+       (rassoc
+	(list response-id-num)
+	(rest (type-expand-1 'response-type)) :test #'equal))
+    (aref (object-data dialog %*response-id-key*) response-id-num )))
+
+
+(defmethod signal-connect ((dialog dialog) signal function &key object after)
+  (let ((response-id-num (%dialog-find-response-id-num dialog signal)))
+    (cond
+     (response-id-num
+      (call-next-method
+       dialog 'response
+       #'(lambda (dialog id)
+	   (when (= id response-id-num)
+	     (cond
+	      ((eq object t) (funcall function dialog))
+	      (object (funcall function object))
+	      (t (funcall function)))))
+       :object t :after after))
+    ((call-next-method)))))
 
-;;; List item
 
-(define-foreign %list-item-new () list-item)
+(defbinding dialog-run () nil
+  (dialog dialog))
 
-(define-foreign %list-item-new-with-label () list-item
-  (label string))
+(defbinding dialog-response (dialog response-id) nil
+  (dialog dialog)
+  ((%dialog-find-response-id-num dialog response-id nil t) int))
 
-(defun list-item-new (&optional label)
-  (if label
-      (%list-item-new-with-label label)
-    (%list-item-new)))
-      
-(define-foreign list-item-select () nil
-  (list-item list-item))
 
-(define-foreign list-item-deselect () nil
-  (list-item list-item))
+(defbinding %dialog-add-button () button
+  (dialog dialog)
+  (text string)
+  (response-id-num int))
 
+(defun dialog-add-button (dialog label &optional (response label)
+			  &key default object after)
+  "Adds a button to the dialog. If no response is given, then label
+   will be used."
+  (let* ((id (if (functionp response)
+		 label
+	       response))
+	 (id-num (%dialog-find-response-id-num dialog id t))
+	 (button (%dialog-add-button dialog label id-num)))
+    (when (functionp response)
+       (signal-connect dialog id response :object object :after after))
+    (when default
+      (%dialog-set-default-response dialog id-num))
+    button))
 
 
-;;; Tree item
+(defbinding %dialog-add-action-widget () button
+  (dialog dialog)
+  (action-widget widget)
+  (response-id-num int))
 
-(define-foreign %tree-item-new () tree-item)
+(defun dialog-add-action-widget (dialog widget &optional (response widget)
+				 &key default object after)
+  (let* ((id (if (functionp response)
+		 widget
+	       response))
+	 (id-num (%dialog-find-response-id-num dialog id t)))
+    (%dialog-add-action-widget dialog widget id-num)
+    (when (functionp response)
+       (signal-connect dialog id response :object object :after after))
+    (when default
+      (%dialog-set-default-response dialog id-num))
+    widget))
 
-(define-foreign %tree-item-new-with-label () tree-item
-  (label string))
 
-(defun tree-item-new (&optional label)
-  (if label
-      (%tree-item-new-with-label label)
-    (%tree-item-new)))
+(defbinding %dialog-set-default-response () nil
+  (dialog dialog)
+  (response-id-num int))
 
-(define-foreign %tree-item-set-subtree () nil
-  (tree-item tree-item)
-  (subtree tree))
+(defun dialog-set-default-response (dialog response-id)
+  (%dialog-set-default-response
+   dialog (%dialog-find-response-id-num dialog response-id nil t)))
 
-(define-foreign %tree-item-remove-subtree () nil
-  (tree-item tree-item))
+(defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
+  (dialog dialog)
+  ((%dialog-find-response-id-num dialog response-id nil t) int)
+  (sensitive boolean))
 
-(defun (setf tree-item-subtree) (subtree tree-item)
-  (if subtree
-      (%tree-item-set-subtree tree-item subtree)
-    (%tree-item-remove-subtree tree-item))
-  subtree)
 
-(define-foreign tree-item-select () nil
-  (tree-item tree-item))
+;; Addition dialog functions
 
-(define-foreign tree-item-deselect () nil
-  (tree-item tree-item))
+(defmethod container-add ((dialog dialog) (child widget) &rest args)
+  (apply #'container-add (dialog-vbox dialog) child args))
 
-(define-foreign tree-item-expand () nil
-  (tree-item tree-item))
+(defmethod container-remove ((dialog dialog) (child widget))
+  (container-remove (dialog-vbox dialog) child))
 
-(define-foreign tree-item-collapse () nil
-  (tree-item tree-item))
+(defmethod container-children ((dialog dialog))
+  (container-children (dialog-vbox dialog)))
 
+(defmethod (setf container-children) (children (dialog dialog))
+  (setf (container-children (dialog-vbox dialog)) children))
 
 
-;;; Window
 
-(define-foreign window-new () window
-  (type window-type))
+;;; Drawing area -- no functions
 
-(define-foreign %window-set-wmclass () nil
-  (window window)
-  (wmclass-name string)
-  (wmclass-class string))
 
-(defun (setf window-wmclass) (wmclass window)
-  (%window-set-wmclass window (svref wmclass 0) (svref wmclass 1))
-  (values (svref wmclass 0) (svref wmclass 1)))
+;;; Entry
 
-;; gtkglue.c
-(define-foreign window-wmclass () nil
-  (window window)
-  (wmclass-name string :out)
-  (wmclass-class string :out))
+(defbinding  entry-get-layout () pango:layout
+  (entry entry))
 
-(define-foreign window-add-accel-group () nil
-  (window window)
-  (accel-group accel-group))
+(defbinding entry-get-layout-offsets () nil
+  (entry entry)
+  (x int :out)
+  (y int :out))
 
-(define-foreign window-remove-accel-group () nil
-  (window window)
-  (accel-group accel-group))
 
-(define-foreign window-activate-focus () int
-  (window window))
+;;; Image
 
-(define-foreign window-activate-default () int
-  (window window))
+(defbinding image-set-from-file () nil
+  (image image)
+  (filename pathname))
 
-(define-foreign window-set-transient-for () nil
-  (window window)
-  (parent window))
+(defbinding image-set-from-pixmap () nil
+  (image image)
+  (pixmap gdk:pixmap)
+  (mask gdk:bitmap))
 
-;(define-foreign window-set-geometry-hints)
+(defbinding image-set-from-stock () nil
+  (image image)
+  (stock-id string)
+  (icon-size icon-size))
 
+(defun image-set-from-pixmap-data (image pixmap-data)
+  (multiple-value-bind (pixmap mask) (gdk:pixmap-create pixmap-data)
+    (image-set-from-pixmap image pixmap mask)))
 
+(defun image-set-from-source (image source)
+  (etypecase source
+    (pathname (image-set-from-file image source))
+    (string (if (stock-lookup source)
+		(setf (image-stock image) source)
+	      (image-set-from-file image source)))
+    (vector (image-set-from-pixmap-data image source))))
 
-;;; Color selection dialog
 
-; (define-foreign color-selection-dialog-new () color-selection-dialog
-;   (title string))
+(defmethod shared-initialize ((image image) names &rest initargs 
+			      &key file pixmap source)
+  (prog1
+      (if (vectorp pixmap)
+	  (progn
+	    (remf initargs :pixmap)
+	    (apply #'call-next-method image names initargs))
+	(call-next-method))
+    (cond
+      (file (image-set-from-file image file))
+      ((vectorp pixmap) (image-set-from-pixmap-data image pixmap))
+      (source (image-set-from-source image source)))))
 
 
+;;; Label
 
-;;; Dialog
+(defbinding label-get-layout-offsets () nil
+  (label label)
+  (x int :out)
+  (y int :out))
 
-(define-foreign dialog-new () dialog)
+(defbinding label-select-region () nil
+  (label label)
+  (start int)
+  (end int))
 
+(defbinding label-get-text () string
+  (label label))
 
+(defbinding label-get-layout () pango:layout
+  (label label))
 
-;;; Input dialog
+(defbinding label-get-selection-bounds () boolean
+  (label label)
+  (start int :out)
+  (end int :out))
 
-(define-foreign input-dialog-new () dialog)
 
 
+;;; Radio button
 
-;;; File selection
+(defbinding %radio-button-get-group () pointer
+  (radio-button radio-button))
 
-; (define-foreign file-selection-new () file-selection
-;   (title string))
+(defbinding %radio-button-set-group () nil
+  (radio-button radio-button)
+  (group pointer))
 
-; (define-foreign file-selection-complete () nil
-;   (file-selection file-selection)
-;   (pattern string))
+(defun radio-button-add-to-group (button1 button2)
+  "Add BUTTON1 to the group which BUTTON2 belongs to."
+  (%radio-button-set-group button1 (%radio-button-get-group button2)))
 
-; (define-foreign file-selection-show-fileop-buttons () nil
-;   (file-selection file-selection))
 
-; (define-foreign file-selection-hide-fileop-buttons () nil
-;   (file-selection file-selection))
+(defmethod initialize-instance ((button radio-button)
+				&rest initargs &key group-with)
+  (declare (ignore initargs))
+  (call-next-method)
+  (when group-with
+    (radio-button-add-to-group button group-with)))
 
 
+;;; Item
 
-;;; Handle box
+(defbinding item-select () nil
+  (item item))
 
-(define-foreign handle-box-new () handle-box)
+(defbinding item-deselect () nil
+  (item item))
 
+(defbinding item-toggle () nil
+  (item item))
 
 
-;;; Scrolled window
 
-(define-foreign scrolled-window-new
-    (&optional hadjustment vadjustment) scrolled-window
-  (hadjustment (or null adjustment))
-  (vadjustment (or null adjustment)))
+;;; Menu item
 
-(defun (setf scrolled-window-scrollbar-policy) (policy window)
-  (setf (scrolled-window-hscrollbar-policy window) policy)
-  (setf (scrolled-window-vscrollbar-policy window) policy))
+(defun (setf menu-item-label) (label menu-item)
+  (make-instance 'accel-label
+   :label label :xalign 0.0 :yalign 0.5 :accel-widget menu-item
+   :visible t :parent menu-item)
+  label)
 
-(define-foreign scrolled-window-add-with-viewport () nil
-   (scrolled-window scrolled-window)
-   (child widget))
+(defun menu-item-label (menu-item)
+  (with-slots (child) menu-item
+    (when (typep child 'label)
+      (label-label child))))
 
+(defbinding %menu-item-set-submenu () nil
+  (menu-item menu-item)
+  (submenu menu))
 
+(defbinding %menu-item-remove-submenu () nil
+  (menu-item menu-item))
 
-;;; Viewport
+(defun (setf menu-item-submenu) (submenu menu-item)
+  (if (not submenu)
+      (%menu-item-remove-submenu menu-item)
+    (%menu-item-set-submenu menu-item submenu))
+  submenu)
 
-(define-foreign viewport-new () viewport
-  (hadjustment adjustment)
-  (vadjustment adjustment))
-  
+(defbinding menu-item-set-accel-path () nil
+  (menu-item menu-item)
+  (accel-path string))
 
+(defbinding menu-item-select () nil
+  (menu-item menu-item))
 
-;;; Box
+(defbinding menu-item-deselect () nil
+  (menu-item menu-item))
 
-(define-foreign box-pack-start () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding unsigned-int))
+(defbinding menu-item-activate () nil
+  (menu-item menu-item))
 
-(define-foreign box-pack-end () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding unsigned-int))
+(defbinding menu-item-toggle-size-request () nil
+  (menu-item menu-item)
+  (requisition int :out))
 
-(defun box-pack (box child &key (pack :start) (expand t) (fill t) (padding 0))
-  (if (eq pack :start)
-      (box-pack-start box child expand fill padding)
-    (box-pack-end box child expand fill padding)))
+(defbinding menu-item-toggle-size-allocate () nil
+  (menu-item menu-item)
+  (allocation int))
 
-(define-foreign box-reorder-child () nil
-  (box box)
-  (child widget)
-  (position int))
 
-(define-foreign box-query-child-packing () nil
-  (box box)
-  (child widget :out)
-  (expand boolean :out)
-  (fill boolean :out)
-  (padding unsigned-int :out)
-  (pack-type pack-type :out))
 
-(define-foreign box-set-child-packing () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding unsigned-int)
-  (pack-type pack-type))
+;;; Radio menu item
 
+(defbinding %radio-menu-item-get-group () pointer
+  (radio-menu-item radio-menu-item))
 
+(defbinding %radio-menu-item-set-group () nil
+  (radio-menu-item radio-menu-item)
+  (group pointer))
 
-;;; Button box
+(defun radio-menu-item-add-to-group (item1 item2)
+  "Add ITEM1 to the group which ITEM2 belongs to."
+  (%radio-menu-item-set-group item1 (%radio-menu-item-get-group item2)))
 
-(define-foreign ("gtk_button_box_get_child_size_default"
-		  button-box-default-child-size) () nil
-  (min-width int :out)
-  (min-height int :out))
+(defmethod initialize-instance ((item radio-menu-item)
+				&rest initargs &key group-with)
+  (declare (ignore initargs))
+  (prog1
+      (call-next-method)
+    (when group-with
+      (radio-menu-item-add-to-group item group-with))))
+  
 
-(define-foreign ("gtk_button_box_get_child_ipadding_default"
-		  button-box-default-child-ipadding) () nil
-  (ipad-x int :out)
-  (ipad-y int :out))
 
-(define-foreign %button-box-set-child-size-default () nil
-  (min-width int)
-  (min-height int))
+;;; Toggle button
 
-(defun (setf button-box-default-child-size) (size)
-  (%button-box-set-child-size-default (svref size 0) (svref size 1))
-  (values (svref size 0) (svref size 1)))
+(defbinding toggle-button-toggled () nil
+  (toggle-button toggle-button))
 
-(define-foreign %button-box-set-child-ipadding-default () nil
-  (ipad-x int)
-  (ipad-y int))
 
-(defun (setf button-box-default-child-ipadding) (ipad)
-  (%button-box-set-child-ipadding-default (svref ipad 0) (svref ipad 1))
-  (values (svref ipad 0) (svref ipad 1)))
 
-(define-foreign
-    ("gtk_button_box_get_child_size" button-box-child-size) () nil
-  (button-box button-box)
-  (min-width int :out)
-  (min-height int :out))
+;;; Window
 
-(define-foreign
-    ("gtk_button_box_get_child_ipadding" button-box-child-ipadding) () nil
-  (button-box button-box)  
-  (ipad-x int :out)
-  (ipad-y int :out))
+(defbinding window-set-wmclass () nil
+  (window window)
+  (wmclass-name string)
+  (wmclass-class string))
 
-(define-foreign %button-box-set-child-size () nil
-  (button-box button-box)
-  (min-width int)
-  (min-height int))
+(defbinding window-add-accel-group () nil
+  (window window)
+  (accel-group accel-group))
 
-(defun (setf button-box-child-size) (size button-box)
-  (%button-box-set-child-size button-box (svref size 0) (svref size 1))
-  (values (svref size 0) (svref size 1)))
+(defbinding window-remove-accel-group () nil
+  (window window)
+  (accel-group accel-group))
 
-(define-foreign %button-box-set-child-ipadding () nil
-  (button-box button-box)
-  (ipad-x int)
-  (ipad-y int))
+(defbinding window-activate-focus () int
+  (window window))
 
-(defun (setf button-box-child-ipadding) (ipad button-box)
-  (%button-box-set-child-ipadding  button-box (svref ipad 0) (svref ipad 1))
-  (values (svref ipad 0) (svref ipad 1)))
+(defbinding window-activate-default () int
+  (window window))
 
+(defbinding window-set-default-size (window width height) int
+  (window window)
+  ((or width -1) int)
+  ((or height -1) int))
 
+;(defbinding window-set-geometry-hints)
 
-;;; HButton box
+(defbinding window-list-toplevels () (glist window))
 
-(define-foreign hbutton-box-new () hbutton-box)
+(defbinding window-add-mnemonic (window key target) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (target widget))
 
-(define-foreign ("gtk_hbutton_box_get_spacing_default"
-		  hbutton-box-default-spacing) () int)
+(defbinding window-remove-mnemonic (window key target) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (target widget))
 
-(define-foreign ("gtk_hbutton_box_set_spacing_default"
-		  (setf hbutton-box-default-spacing)) () nil
-  (spacing int))
-  
-(define-foreign ("gtk_hbutton_box_get_layout_default"
-		  hbutton-box-default-layout) () button-box-style)
+(defbinding window-mnemonic-activate (window key modifier) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (modifier gdk:modifier-type))
 
-(define-foreign ("gtk_hbutton_box_set_layout_default"
-		  (setf hbutton-box-default-layout)) () nil
-  (layout button-box-style))
+(defbinding window-present () nil
+  (window window))
 
+(defbinding window-iconify () nil
+  (window window))
 
+(defbinding window-deiconify () nil
+  (window window))
 
-;;; VButton Box
+(defbinding window-stick () nil
+  (window window))
 
-(define-foreign vbutton-box-new () vbutton-box)
+(defbinding window-unstick () nil
+  (window window))
 
-(define-foreign ("gtk_vbutton_box_get_spacing_default"
-		  vbutton-box-default-spacing) () int)
+(defbinding window-maximize () nil
+  (window window))
 
-(define-foreign ("gtk_vbutton_box_set_spacing_default"
-		  (setf vbutton-box-default-spacing)) () nil
-  (spacing int))
-  
-(define-foreign ("gtk_vbutton_box_get_layout_default"
-		  vbutton-box-default-layout) () button-box-style)
+(defbinding window-unmaximize () nil
+  (window window))
 
-(define-foreign ("gtk_vbutton_box_set_layout_default"
-		  (setf vbutton-box-default-layout)) () nil
-  (layout button-box-style))
+(defbinding window-begin-resize-drag () nil
+  (window window)
+  (edge gdk:window-edge)
+  (button int)
+  (root-x int) (root-y int)
+  (timestamp unsigned-int))
 
+(defbinding window-begin-move-drag () nil
+  (window window)
+  (edge gdk:window-edge)
+  (button int)
+  (root-x int) (root-y int)
+  (timestamp unsigned-int))
 
+(defbinding window-set-frame-dimensions () nil
+  (window window)
+  (left int) (top int) (rigth int) (bottom int))
 
-;;; VBox
+(defbinding (window-default-icons "gtk_window_get_default_icon_list")
+    () (glist gdk:pixbuf))
 
-(define-foreign vbox-new () vbox
-  (homogeneous boolean)
-  (spacing int))
+(defbinding %window-get-default-size () nil
+  (window window)
+  (width int :out)
+  (height int :out))
 
+(defun window-get-default-size (window)
+  (multiple-value-bind (width height) (%window-get-default-size window)
+    (values (unless (= width -1) width) (unless (= height -1) height))))
 
+(defbinding window-get-frame-dimensions () nil
+  (window window)
+  (left int :out) (top int :out) (rigth int :out) (bottom int :out))
 
-;;; Color selection
+(defbinding %window-get-icon-list () (glist gdk:pixbuf)
+  (window window))
 
-; (define-foreign color-selection-new () color-selection)
+(defmethod window-icon ((window window))
+  (let ((icon-list (%window-get-icon-list window)))
+    (if (endp (rest icon-list))
+	(first icon-list)
+      icon-list)))
 
-; ;; gtkglue.c
-; (define-foreign %color-selection-set-color-by-values () nil
-;   (colorsel color-selection)
-;   (red double-float)
-;   (green double-float)
-;   (blue double-float)
-;   (opacity double-float))
+(defbinding window-get-position () nil
+  (window window)
+  (root-x int :out)
+  (root-y int :out))
 
-; (defun (setf color-selection-color) (color colorsel)
-;   (%color-selection-set-color-by-values
-;    colorsel
-;    (svref color 0) (svref color 1) (svref color 2)
-;    (if (> (length color) 3)
-;        (svref color 3)
-;      1.0))
-;   color)
+(defbinding window-get-size () nil
+  (window window)
+  (width int :out)
+  (height int :out))
 
-; ;; gtkglue.c
-; (define-foreign %color-selection-get-color-as-values () nil
-;   (colorsel color-selection)
-;   (red double-float :out)
-;   (green double-float :out)
-;   (blue double-float :out)
-;   (opacity double-float :out))
+(defbinding window-move () nil
+  (window window)
+  (x int)
+  (y int))
 
-; (defun color-selection-color (colorsel)
-;   (multiple-value-bind (red green blue opacity)
-;       (%color-selection-get-color-as-values colorsel)
-;     (if (color-selection-use-opacity-p colorsel)
-; 	(vector red green blue opacity)
-;       (vector red green blue))))
+(defbinding window-parse-geometry () boolean
+  (window window)
+  (geometry string))
 
+(defbinding window-reshow-with-initial-size () nil
+  (window window))
 
+(defbinding window-resize () nil
+  (window window)
+  (width int)
+  (heigth int))
 
+(defbinding %window-set-icon-list () nil
+  (window window)
+  (icon-list (glist gdk:pixbuf)))
 
-; ;;; Gamma curve
+(defmethod (setf window-icon) (icon (window window))
+  (%window-set-icon-list window (mklist icon)))
 
-; (define-foreign gamma-curve-new () gamma-curve)
 
 
 
-;;; HBox
+;;; File chooser
 
-(define-foreign hbox-new () hbox
-  (homogeneous boolean)
-  (spacing int))
 
 
 
-;;; Combo
+;;; Scrolled window
 
-(define-foreign combo-new () combo)
+(defun (setf scrolled-window-scrollbar-policy) (policy window)
+  (setf (scrolled-window-hscrollbar-policy window) policy)
+  (setf (scrolled-window-vscrollbar-policy window) policy))
 
-(define-foreign combo-set-value-in-list () nil
-  (combo combo)
-  (val boolean)
-  (ok-if-empty boolean))
+(defbinding scrolled-window-add-with-viewport () nil
+   (scrolled-window scrolled-window)
+   (child widget))
 
-; (define-foreign ("gtk_combo_set_item_string" (setf combo-item-string)) () nil
-;   (combo combo)
-;   (item item)
-;   (item-value string))
 
-(define-foreign %combo-set-popdown-strings () nil
-  (combo combo)
-  (strings (double-list string)))
 
-(defun (setf combo-popdown-strings) (strings combo)
-  (%combo-set-popdown-strings combo strings)
-  strings)
 
-(define-foreign combo-disable-activate () nil
-  (combo combo))
 
 
 
 ;;; Statusbar
 
-(define-foreign statusbar-new () statusbar)
-
-(define-foreign
-    ("gtk_statusbar_get_context_id" statusbar-context-id) () unsigned-int
+(defbinding (statusbar-context-id "gtk_statusbar_get_context_id")
+    () unsigned-int
   (statusbar statusbar)
   (context-description string))
 
-(define-foreign statusbar-push () unsigned-int
+(defbinding statusbar-push () unsigned-int
   (statusbar statusbar)
   (context-id unsigned-int)  
   (text string))
 
-(define-foreign statusbar-pop () nil
+(defbinding statusbar-pop () nil
   (statusbar statusbar)
   (context-id unsigned-int))
 
-(define-foreign statusbar-remove () nil
+(defbinding statusbar-remove () nil
   (statusbar statusbar)
   (context-id unsigned-int)
   (message-id unsigned-int))
@@ -839,512 +840,339 @@
 
 ;;; Fixed
 
-(define-foreign fixed-new () fixed)
-
-(define-foreign fixed-put () nil
+(defbinding fixed-put () nil
   (fixed fixed)
   (widget widget)
-  (x (signed 16))
-  (y (signed 16)))
+  (x int) (y int))
 
-(define-foreign fixed-move () nil
+(defbinding fixed-move () nil
   (fixed fixed)
   (widget widget)
-  (x (signed 16))
-  (y (signed 16)))
+  (x int) (y int))
+
 
 
+;;; Notebook
 
-; ;;; Notebook
+(defun %notebook-position (notebook page)
+  (etypecase page
+    (int page)
+    (keyword (case page
+	       (:first 0)
+	       (:last -1)
+	       (t (error "Invalid position keyword: ~A" page))))
+    (widget (notebook-page-num notebook page t))))
 
-(define-foreign notebook-new () notebook)
+(defun %notebook-child (notebook position)
+  (typecase position
+     (widget position)
+     (t (notebook-nth-page-child notebook position))))
 
-(define-foreign ("gtk_notebook_insert_page_menu" notebook-insert-page)
+
+(defbinding (notebook-insert "gtk_notebook_insert_page_menu")
     (notebook position child tab-label &optional menu-label) nil
   (notebook notebook)
   (child widget)
   ((if (stringp tab-label)
-       (label-new tab-label)
+       (make-instance 'label :label tab-label)
      tab-label) widget)
   ((if (stringp menu-label)
-       (label-new menu-label)
+       (make-instance 'label :label menu-label)
      menu-label) (or null widget))
-  (position int))
-
-(defun notebook-append-page (notebook child tab-label &optional menu-label)
-  (notebook-insert-page notebook -1 child tab-label menu-label))
-
-(defun notebook-prepend-page (notebook child tab-label &optional menu-label)
-  (notebook-insert-page notebook 0 child tab-label menu-label))
-  
-(define-foreign notebook-remove-page () nil
-  (notebook notebook)
-  (page-num int))
-
-; (defun notebook-current-page-num (notebook)
-;   (let ((page-num (notebook-current-page notebook)))
-;     (if (= page-num -1)
-; 	nil
-;       page-num)))
-
-(define-foreign ("gtk_notebook_get_nth_page" notebook-nth-page-child) () widget
-  (notebook notebook)
-  (page-num int))
-
-(defun notebook-page-child (notebook)
-  (notebook-nth-page-child notebook (notebook-page notebook)))
-
-(define-foreign %notebook-page-num () int
-  (notebook notebook)
-  (child widget))
-
-(defun notebook-child-num (notebook child)
-  (let ((page-num (%notebook-page-num notebook child)))
-    (if (= page-num -1)
-	nil
-      page-num)))
-
-(define-foreign notebook-next-page () nil
-  (notebook notebook))
-
-(define-foreign notebook-prev-page () nil
-  (notebook notebook))
-
-(define-foreign notebook-popup-enable () nil
-  (notebook notebook))
-
-(define-foreign notebook-popup-disable () nil
-  (notebook notebook))
-
-(define-foreign
-    ("gtk_notebook_get_tab_label" notebook-tab-label) (notebook ref) widget
-  (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget))
-
-(define-foreign %notebook-set-tab-label () nil
-  (notebook notebook)
-  (reference widget)
-  (tab-label widget))
-
-(defun (setf notebook-tab-label) (tab-label notebook reference)
-  (let ((tab-label-widget (if (stringp tab-label)
-			      (label-new tab-label)
-			    tab-label)))
-    (%notebook-set-tab-label
-     notebook
-     (if (typep reference 'widget)
-	 reference
-       (notebook-nth-page-child notebook reference))
-     tab-label-widget)
-    (when (stringp tab-label)
-      (widget-unref tab-label-widget))
-    tab-label-widget))
-   
-(define-foreign
-    ("gtk_notebook_get_menu_label" notebook-menu-label) (notebook ref) widget
-  (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget))
-
-(define-foreign %notebook-set-menu-label () nil
-  (notebook notebook)
-  (reference widget)
-  (menu-label widget))
-
-(defun (setf notebook-menu-label) (menu-label notebook reference)
-  (let ((menu-label-widget (if (stringp menu-label)
-			      (label-new menu-label)
-			    menu-label)))
-    (%notebook-set-menu-label
-     notebook
-     (if (typep reference 'widget)
-	 reference
-       (notebook-nth-page-child notebook reference))
-     menu-label-widget)
-    (when (stringp menu-label)
-      (widget-unref menu-label-widget))
-    menu-label-widget))
-
-(define-foreign notebook-query-tab-label-packing (notebook ref) nil
-  (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget)
-  (expand boolean :out)
-  (fill boolean :out)
-  (pack-type pack-type :out))
-
-(define-foreign
-    notebook-set-tab-label-packing (notebook ref expand fill pack-type) nil
-  (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget)
-  (expand boolean)
-  (fill boolean)
-  (pack-type pack-type))
-
-(define-foreign notebook-reorder-child () nil
-  (notebook notebook)
-  (child widget)
-  (position int))
-
-
-
-; ;;; Font selection
-
-
-
-
-; ;;; Paned
-
-; (define-foreign paned-add1 () nil
-;   (paned paned)
-;   (child widget))
-
-; (define-foreign paned-add2 () nil
-;   (paned paned)
-;   (child widget))
-
-; (define-foreign paned-pack1 () nil
-;   (paned paned)
-;   (child widget)
-;   (resize boolean)
-;   (shrink boolean))
-
-; (define-foreign paned-pack2 () nil
-;   (paned paned)
-;   (child widget)
-;   (resize boolean)
-;   (shrink boolean))
-
-; ; (define-foreign ("gtk_paned_set_position" (setf paned-position)) () nil
-; ;   (paned paned)
-; ;   (position int))
-
-; ;; gtkglue.c
-; (define-foreign paned-child1 () widget
-;   (paned paned)
-;   (resize boolean :out)
-;   (shrink boolean :out))
-
-; ;; gtkglue.c
-; (define-foreign paned-child2 () widget
-;   (paned paned)
-;   (resize boolean :out)
-;   (shrink boolean :out))
+  ((%notebook-position notebook position) int))
 
-; (define-foreign vpaned-new () vpaned)
+(defun notebook-append (notebook child tab-label &optional menu-label)
+  (notebook-insert notebook :last child tab-label menu-label))
 
-; (define-foreign hpaned-new () hpaned)
+(defun notebook-prepend (notebook child tab-label &optional menu-label)
+  (notebook-insert notebook :first child tab-label menu-label))
+  
+(defbinding notebook-remove-page (notebook page) nil
+  (notebook notebook)
+  ((%notebook-position notebook page) int))
 
+(defbinding %notebook-page-num () int
+  (notebook notebook)
+  (child widget))
 
+(defun notebook-page-num (notebook child &optional error-p)
+  (let ((page-num (%notebook-page-num notebook child)))
+    (if (= page-num -1)
+	(when error-p
+	  (error "~A is not a child of ~A" child notebook))
+      page-num)))
 
-; ;;; Layout
+(defbinding notebook-next-page () nil
+  (notebook notebook))
 
-; (define-foreign layout-new (&optional hadjustment vadjustment) layout
-;   (hadjustment (or null adjustment))
-;   (vadjustment (or null adjustment)))
+(defbinding notebook-prev-page () nil
+  (notebook notebook))
 
-; (define-foreign layout-put () nil
-;   (layout layout)
-;   (widget widget)
-;   (x int) (y int))
+(defbinding notebook-reorder-child (notebook child position) nil
+  (notebook notebook)
+  (child widget)
+  ((%notebook-position notebook position) int))
 
-; (define-foreign layout-move () nil
-;   (layout layout)
-;   (widget widget)
-;   (x int) (y int))
+(defbinding notebook-popup-enable () nil
+  (notebook notebook))
 
-; (define-foreign %layout-set-size () nil
-;   (layout layout)
-;   (width int)
-;   (height int))
+(defbinding notebook-popup-disable () nil
+  (notebook notebook))
 
-; (defun (setf layout-size) (size layout)
-;   (%layout-set-size layout (svref size 0) (svref size 1))
-;   (values (svref size 0) (svref size 1)))
+(defbinding (notebook-nth-page-child "gtk_notebook_get_nth_page")
+    (notebook page) widget
+  (notebook notebook)
+  ((case page
+     (:first 0)
+     (:last -1)
+     (t page)) int))
 
-; ;; gtkglue.c
-; (define-foreign layout-size () nil
-;   (layout layout)
-;   (width int :out)
-;   (height int :out))
 
-; (define-foreign layout-freeze () nil
-;   (layout layout))
+(defbinding %notebook-get-current-page () int
+  (notebook notebook))
 
-; (define-foreign layout-thaw () nil
-;   (layout layout))
+(defun notebook-current-page-num (notebook)
+  (let ((num (%notebook-get-current-page notebook)))
+    (when (>= num 0)
+      num)))
 
-; (define-foreign layout-offset () nil
-;   (layout layout)
-;   (x int :out)
-;   (y int :out))
+(defun notebook-current-page (notebook)
+  (let ((page-num (notebook-current-page-num notebook)))
+    (when page-num
+      (notebook-nth-page-child notebook page-num))))
 
+(defbinding  %notebook-set-current-page () nil
+  (notebook notebook)
+  (page-num int))
 
+(defun (setf notebook-current-page) (page notebook)
+  (%notebook-set-current-page notebook (%notebook-position notebook page))
+  page)
 
-;;; List
 
-; (define-foreign list-new () list-widget)
+(defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
+    (notebook page) widget
+  (notebook notebook)
+  ((%notebook-child notebook page) widget))
 
-; (define-foreign list-insert-items () nil
-;   (list list-widget)
-;   (items (list list-item))
-;   (position int))
+(defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
+    (notebook page) (copy-of string)
+  (notebook notebook)
+  ((%notebook-child notebook page) widget))
 
-; (define-foreign list-append-items () nil
-;   (list list-widget)
-;   (items (double-list list-item)))
+(defbinding %notebook-set-tab-label () nil
+  (notebook notebook)
+  (page widget)
+  (tab-label widget))
 
-; (define-foreign list-prepend-items () nil
-;   (list list-widget)
-;   (items (double-list list-item)))
+(defun (setf notebook-tab-label) (tab-label notebook page)
+  (let ((widget (if (stringp tab-label)
+		    (make-instance 'label :label tab-label)
+		  tab-label)))
+    (%notebook-set-tab-label notebook (%notebook-child notebook page) widget)
+    widget))
 
-; (define-foreign %list-remove-items () nil
-;   (list list-widget)
-;   (items (double-list list-item)))
 
-; (define-foreign %list-remove-items-no-unref () nil
-;   (list list-widget)
-;   (items (double-list list-item)))
+(defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
+    (notebook page) widget
+  (notebook notebook)
+  ((%notebook-child notebook page) widget))
 
-; (defun list-remove-items (list items &key no-unref)
-;   (if no-unref
-;       (%list-remove-items-no-unref list items)
-;     (%list-remove-items list items)))
+(defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
+    (notebook page) (copy-of string)
+  (notebook notebook)
+  ((%notebook-child notebook page) widget))
 
-; (define-foreign list-clear-items () nil
-;   (list list-widget)
-;   (start int)
-;   (end int))
+(defbinding %notebook-set-menu-label () nil
+  (notebook notebook)
+  (page widget)
+  (menu-label widget))
 
-; (define-foreign list-select-item () nil
-;   (list list-widget)
-;   (item int))
+(defun (setf notebook-menu-label) (menu-label notebook page)
+  (let ((widget (if (stringp menu-label)
+		    (make-instance 'label :label menu-label)
+		  menu-label)))
+    (%notebook-set-menu-label notebook (%notebook-child notebook page) widget)
+    widget))
 
-; (define-foreign list-unselect-item () nil
-;   (list list-widget)
-;   (item int))
 
-; (define-foreign list-select-child () nil
-;   (list list-widget)
-;   (child widget))
+(defbinding notebook-query-tab-label-packing (notebook page) nil
+  (notebook notebook)
+  ((%notebook-child notebook page) widget)
+  (expand boolean :out)
+  (fill boolean :out)
+  (pack-type pack-type :out))
 
-; (define-foreign list-unselect-child () nil
-;   (list list-widget)
-;   (child widget))
+(defbinding notebook-set-tab-label-packing
+    (notebook page expand fill pack-type) nil
+  (notebook notebook)
+  ((%notebook-child notebook page) widget)
+  (expand boolean)
+  (fill boolean)
+  (pack-type pack-type))
 
-; (define-foreign list-child-position () int
-;   (list list-widget)
-;   (child widget))
 
-; (define-foreign list-extend-selection () nil
-;   (list list-widget)
-;   (scroll-type scroll-type)
-;   (position single-float)
-;   (auto-start-selection boolean))
 
-; (define-foreign list-start-selection () nil
-;   (list list-widget))
+;;; Paned
 
-; (define-foreign list-end-selection () nil
-;   (list list-widget))
+(defbinding paned-pack1 () nil
+  (paned paned)
+  (child widget)
+  (resize boolean)
+  (shrink boolean))
 
-; (define-foreign list-select-all () nil
-;   (list list-widget))
+(defbinding paned-pack2 () nil
+  (paned paned)
+  (child widget)
+  (resize boolean)
+  (shrink boolean))
 
-; (define-foreign list-unselect-all () nil
-;   (list list-widget))
+(defun (setf paned-child1) (child paned)
+  (paned-pack1 paned child nil t)
+  child)
 
-; (define-foreign list-scroll-horizontal () nil
-;   (list list-widget)
-;   (scroll-type scroll-type)
-;   (position single-float))
+(defun (setf paned-child2) (child paned)
+  (paned-pack2 paned child t t)
+  child)
 
-; (define-foreign list-scroll-vertical () nil
-;   (list list-widget)
-;   (scroll-type scroll-type)
-;   (position single-float))
+;; Defined in gtkglue.c
+(defbinding paned-child1 () widget
+  (paned paned)
+  (resize boolean :out)
+  (shrink boolean :out))
 
-; (define-foreign list-toggle-add-mode () nil
-;   (list list-widget))
+;; Defined in gtkglue.c
+(defbinding paned-child2 () widget
+  (paned paned)
+  (resize boolean :out)
+  (shrink boolean :out))
 
-; (define-foreign list-toggle-focus-row () nil
-;   (list list-widget))
 
-; (define-foreign list-toggle-row () nil
-;   (list list-widget)
-;   (item list-item))
 
-; (define-foreign list-undo-selection () nil
-;   (list list-widget))
+;;; Layout
 
-; (define-foreign list-end-drag-selection () nil
-;   (list list-widget))
+(defbinding layout-put () nil
+  (layout layout)
+  (widget widget)
+  (x int)
+  (y int))
 
-; ;; gtkglue.c
-; (define-foreign list-selection () (double-list list-item)
-;   (list list-widget))
+(defbinding layout-move () nil
+  (layout layout)
+  (widget widget)
+  (x int)
+  (y int))
 
 
 
 ;;; Menu shell
 
-(define-foreign menu-shell-insert () nil
+(defbinding menu-shell-insert (menu-shell menu-item position) nil
   (menu-shell menu-shell)
   (menu-item menu-item)
-  (position int))
+  ((case position
+     (:first 0)
+     (:last -1)
+     (t position)) int))
 
 (defun menu-shell-append (menu-shell menu-item)
-  (menu-shell-insert menu-shell menu-item -1))
+  (menu-shell-insert menu-shell menu-item :last))
 
 (defun menu-shell-prepend (menu-shell menu-item)
-  (menu-shell-insert menu-shell menu-item 0))
+  (menu-shell-insert menu-shell menu-item :fisrt))
 
-(define-foreign menu-shell-deactivate () nil
+(defbinding menu-shell-deactivate () nil
   (menu-shell menu-shell))
 
-(define-foreign menu-shell-select-item () nil
+(defbinding menu-shell-select-item () nil
   (menu-shell menu-shell)
   (menu-item menu-item))
 
-(define-foreign menu-shell-deselect () nil
+(defbinding menu-shell-deselect () nil
   (menu-shell menu-shell))
 
-(define-foreign menu-shell-activate-item () nil
+(defbinding menu-shell-activate-item () nil
   (menu-shell menu-shell)
   (menu-item menu-item)
   (fore-deactivate boolean))
 
 
 
-; ;;; Menu bar
-
-(define-foreign menu-bar-new () menu-bar)
-
-; (define-foreign menu-bar-insert () nil
-;   (menu-bar menu-bar)
-;   (menu menu)
-;   (position int))
-
-; (defun menu-bar-append (menu-bar menu)
-;   (menu-bar-insert menu-bar menu -1))
-
-; (defun menu-bar-prepend (menu-bar menu)
-;   (menu-bar-insert menu-bar menu 0))
-
-
-
-; ;;; Menu
-
-(define-foreign menu-new () menu)
+;;; Menu
 
-; (defun menu-insert (menu menu-item position)
-;   (menu-shell-insert menu menu-item position))
+(defun %menu-position (menu child)
+  (etypecase child
+    (int child)
+    (keyword (case child
+	       (:first 0)
+	       (:last -1)
+	       (t (error "Invalid position keyword: ~A" child))))
+    (widget (menu-child-position menu child))))
 
-; (defun menu-append (menu menu-item)
-;   (menu-shell-append menu menu-item))
 
-; (defun menu-prepend (menu menu-item)
-;   (menu-shell-prepend menu menu-item))
-
-;(defun menu-popup ...)
-
-(define-foreign menu-reposition () nil
-  (menu menu))
-
-(define-foreign menu-popdown () nil
-  (menu menu))
+(defbinding menu-reorder-child (menu menu-item position) nil
+  (menu menu)
+  (menu-item menu-item)
+  ((%menu-position menu position) int))
 
-(define-foreign ("gtk_menu_get_active" menu-active) () widget
-  (menu menu))
+(def-callback-marshal %menu-popup-callback (nil (x int) (y int) (push-in boolean)))
 
-(define-foreign ("gtk_menu_set_active" (setf menu-active)) () nil
+(defbinding %menu-popup () nil
   (menu menu)
-  (index unsigned-int))
-
-;(defun menu-attach-to-widget ...)
+  (parent-menu-shell (or null menu-shell))
+  (parent-menu-item (or null menu-item))
+  (callback-func (or null pointer))
+  (callback-id unsigned-int)
+  (button unsigned-int)
+  (activate-time (unsigned 32)))
+
+(defun menu-popup (menu button activate-time &key callback parent-menu-shell
+		   parent-menu-item)
+  (if callback
+      (with-callback-function (id callback)
+	(%menu-popup 
+	 menu parent-menu-shell parent-menu-item 
+	 (callback %menu-popup-callback) id button activate-time))
+    (%menu-popup
+     menu parent-menu-shell parent-menu-item nil 0 button activate-time)))
+ 
+(defbinding menu-set-accel-path () nil
+  (menu menu)
+  (accel-path string))
 
-(define-foreign menu-detach () nil
+(defbinding menu-reposition () nil
   (menu menu))
 
-(define-foreign ("gtk_menu_get_attach_widget" menu-attach-widget) () widget
+(defbinding menu-popdown () nil
   (menu menu))
 
-(define-foreign menu-reorder-child () nil
-  (menu menu)
-  (menu-item menu-item)
-  (position int))
-
+(defun menu-child-position (menu child)
+  (position child (container-children menu)))
 
+(defun menu-active-num (menu)
+  (menu-child-position menu (menu-active menu)))
 
-;;; Packer
-
-(define-foreign packer-new () packer)
-
-(define-foreign packer-add
-    (packer child side anchor
-     &key
-     options
-     (border-width (packer-default-border-width packer))
-     (pad-x (packer-default-pad-x packer))
-     (pad-y (packer-default-pad-y packer))
-     (ipad-x (packer-default-ipad-x packer))
-     (ipad-y (packer-default-ipad-y packer))) nil
-  (packer packer)
-  (child widget)
-  (side side-type)
-  (anchor anchor-type)
-  (options packer-options)
-  (border-width unsigned-int)
-  (pad-x unsigned-int)
-  (pad-y unsigned-int)
-  (ipad-x unsigned-int)
-  (ipad-y unsigned-int))
-
-(define-foreign packer-set-child-packing () nil
-  (packer packer)
-  (child widget)
-  (side side-type)
-  (anchor anchor-type)
-  (options packer-options)
-  (border-width unsigned-int)
-  (pad-x unsigned-int)
-  (pad-y unsigned-int)
-  (ipad-x unsigned-int)
-  (ipad-y unsigned-int))
-
-(define-foreign packer-reorder-child () nil
-  (packer packer)
-  (child widget)
-  (position int))
+(defbinding %menu-set-active () nil
+  (menu menu)
+  (index unsigned-int))
 
+(defun (setf menu-active) (menu child)
+  (%menu-set-active menu (%menu-position menu child))
+  child)
+  
 
 
 ;;; Table
 
-(define-foreign table-new () table
-  (rows unsigned-int)
-  (columns unsigned-int)
-  (homogeneous boolean))
-
-(define-foreign table-resize () nil
+(defbinding table-resize () nil
   (table table)
   (rows unsigned-int)
   (columns unsigned-int))
 
-(define-foreign table-attach (table child left right top bottom
-			       &key (x-options '(:expand :fill))
-			            (y-options '(:expand :fill))
-			            (x-padding 0) (y-padding 0)) nil
+(defbinding table-attach (table child left right top bottom
+			  &key (x-options '(:expand :fill))
+			       (y-options '(:expand :fill))
+			       (x-padding 0) (y-padding 0)) nil
   (table table)
   (child widget)
   (left unsigned-int)
@@ -1356,82 +1184,67 @@
   (x-padding unsigned-int)
   (y-padding unsigned-int))
 
-(define-foreign %table-set-row-spacing () nil
+
+(defbinding %table-set-row-spacing () nil
   (table table)
   (row unsigned-int)
   (spacing unsigned-int))
 
-(defun (setf table-row-spacing) (spacing table row)
-  (%table-set-row-spacing table row spacing)
+(defbinding %table-set-row-spacings () nil
+  (table table)
+  (spacing unsigned-int))
+
+(defun (setf table-row-spacing) (spacing table &optional row)
+  (if row
+      (%table-set-row-spacing table row spacing)
+    (%table-set-row-spacings table spacing))
   spacing)
 
-;; gtkglue.c
-(define-foreign table-row-spacing (table row) unsigned-int
+(defbinding %table-get-row-spacing () unsigned-int
   (table table)
-  ((progn
-     (assert (and (>= row 0) (< row (table-rows table))))
-     row) unsigned-int))
+  (row unsigned-int))
 
-(define-foreign %table-set-col-spacing () nil
+(defbinding %table-get-default-row-spacing () unsigned-int
+  (table table))
+
+(defun table-row-spacing (table &optional row)
+  (if row
+      (%table-get-row-spacing table row)
+    (%table-get-default-row-spacing table)))
+
+
+(defbinding %table-set-col-spacing () nil
   (table table)
   (col unsigned-int)
   (spacing unsigned-int))
 
-(defun (setf table-column-spacing) (spacing table column)
-  (%table-set-column-spacing table column spacing)
+(defbinding %table-set-col-spacings () nil
+  (table table)
+  (spacing unsigned-int))
+
+(defun (setf table-col-spacing) (spacing table &optional col)
+  (if col
+      (%table-set-col-spacing table col spacing)
+    (%table-set-col-spacings table spacing))
   spacing)
 
-;; gtkglue.c
-(define-foreign table-column-spacing (table col) unsigned-int
+(defbinding %table-get-col-spacing () unsigned-int
   (table table)
-  ((progn
-     (assert (and (>= col 0) (< col (table-columns table))))
-     col) unsigned-int))
+  (col unsigned-int))
 
+(defbinding %table-get-default-col-spacing () unsigned-int
+  (table table))
 
-(defun %set-table-child-option (object slot flag value)
-  (let ((options (container-child-slot-value object slot)))
-    (cond
-     ((and value (not (member flag options)))
-      (setf (container-child-slot-value object slot) (cons flag options)))
-     ((and (not value) (member flag options))
-      (setf
-       (container-child-slot-value object slot) (delete flag options))))))
-
-(macrolet ((define-option-accessor (name slot flag)
-	     `(progn
-		(defun ,name (object)
-		  (member ,flag (container-child-slot-value object ,slot)))
-		(defun (setf ,name) (value object)
-		  (%set-table-child-option object ,slot ,flag value)))))
-  (define-option-accessor table-child-x-expand-p :x-options :expand)
-  (define-option-accessor table-child-y-expand-p :y-options :expand)
-  (define-option-accessor table-child-x-shrink-p :x-options :shrink)
-  (define-option-accessor table-child-y-shrink-p :y-options :shrink)
-  (define-option-accessor table-child-x-fill-p :x-options :fill)
-  (define-option-accessor table-child-y-fill-p :y-options :fill))
-
+(defun table-col-spacing (table &optional col)
+  (if col
+      (%table-get-col-spacing table col)
+    (%table-get-default-col-spacing table)))
+  
 
 
 ;;; Toolbar
 
-(define-foreign toolbar-new () toolbar
-  (orientation orientation)
-  (style toolbar-style))
-
-;; gtkglue.c
-(define-foreign toolbar-num-children () int
-  (toolbar toolbar))
-
-(defun %toolbar-position-num (toolbar position)
-  (case position
-    (:prepend 0)
-    (:append (toolbar-num-children toolbar))
-    (t
-     (assert (and (>= position 0) (< position (toolbar-num-children toolbar))))
-     position)))
-
-(define-foreign %toolbar-insert-element () widget
+(defbinding %toolbar-insert-element () widget
   (toolbar toolbar)
   (type toolbar-child-type)
   (widget (or null widget))
@@ -1443,80 +1256,85 @@
   (nil null)
   (position int))
 
-(defun toolbar-insert-element (toolbar position
-			       &key tooltip-text tooltip-private-text
-			       type widget icon text callback)
-  (let* ((icon-widget (typecase icon
-		       ((or null widget) icon)
-		       (t (pixmap-new icon))))
-	 (toolbar-child
-	  (%toolbar-insert-element
-	   toolbar (or type (and widget :widget) :button)
-	   widget text tooltip-text tooltip-private-text icon-widget
-	   (%toolbar-position-num toolbar position))))
+(defbinding %toolbar-insert-stock () widget
+  (toolbar toolbar)
+  (stock-id string)
+  (tooltip-text string)
+  (tooltip-private-text string)
+  (nil null)
+  (nil null)
+  (position int))
+
+(defun toolbar-insert (toolbar position element
+		       &key tooltip-text tooltip-private-text
+		       type icon group callback object)
+  (let* ((numpos (case position
+		   (:first -1)
+		   (:last 0)
+		   (t position)))
+	 (widget
+	  (cond
+	   ((or
+	     (eq type :space)
+	     (and (not type) (eq element :space)))
+	    (%toolbar-insert-element
+	     toolbar :space nil nil
+	     tooltip-text tooltip-private-text nil numpos))
+	   ((or
+	     (eq type :widget)
+	     (and (not type) (typep element 'widget)))
+	    (%toolbar-insert-element
+	     toolbar :widget element nil
+	     tooltip-text tooltip-private-text nil numpos))
+	   ((or
+	     (eq type :stock)
+	     (and
+	      (not type)
+	      (typep element 'string)
+	      (stock-lookup element)))
+	    (%toolbar-insert-stock
+	     toolbar element tooltip-text tooltip-private-text numpos))
+	   ((typep element 'string)
+	    (%toolbar-insert-element
+	     toolbar (or type :button) (when (eq type :radio-button) group)
+	     element tooltip-text tooltip-private-text 
+	     (etypecase icon
+	       (null nil)
+	       (widget icon)
+	       ((or pathname string vector)
+		(make-instance 'image 
+		 :source icon ; :icon-size (toolbar-icon-size toolbar)
+		 )))
+	     numpos))
+	   ((error "Invalid element type: ~A" element)))))
     (when callback
-      (signal-connect toolbar-child 'clicked callback))
-    toolbar-child))
+      (signal-connect widget 'clicked callback :object object))
+    widget))
 
-(defun toolbar-append-element (toolbar &key tooltip-text tooltip-private-text
-			       type widget icon text callback)
-  (toolbar-insert-element
-   toolbar :append :type type :widget widget :icon icon :text text
+(defun toolbar-append (toolbar element &key tooltip-text tooltip-private-text
+		       type icon group callback object)
+  (toolbar-insert
+   toolbar :first element :type type :icon icon :group group
    :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text
-   :callback callback))
+   :callback callback :object object))
 
-(defun toolbar-prepend-element (toolbar &key tooltip-text tooltip-private-text
-			        type widget icon text callback)
-  (toolbar-insert-element
-   toolbar :prepend :type type :widget widget :icon icon :text text
+(defun toolbar-prepend (toolbar element &key tooltip-text tooltip-private-text
+			type icon group callback object)
+  (toolbar-insert
+   toolbar :last element :type type :icon icon :group group
    :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text
-   :callback callback))
+   :callback callback :object object))
+
 
 (defun toolbar-insert-space (toolbar position)
-  (toolbar-insert-element toolbar position :type :space))
+  (toolbar-insert toolbar position :space))
 
 (defun toolbar-append-space (toolbar)
-  (toolbar-insert-space toolbar :append))
+  (toolbar-append toolbar :space))
 
 (defun toolbar-prepend-space (toolbar)
-  (toolbar-insert-space toolbar :prepend))
+  (toolbar-prepend toolbar :space))
 
-(defun toolbar-insert-widget (toolbar widget position &key tooltip-text
-			      tooltip-private-text callback)
-  (toolbar-insert-element
-   toolbar position :widget widget :tooltip-text tooltip-text
-   :tooltip-private-text tooltip-private-text :callback callback))
- 
-(defun toolbar-append-widget (toolbar widget &key tooltip-text
-			      tooltip-private-text callback)
-  (toolbar-insert-widget
-   toolbar widget :append :tooltip-text tooltip-text
-   :tooltip-private-text tooltip-private-text :callback callback))
-
-(defun toolbar-prepend-widget (toolbar widget &key tooltip-text
-			       tooltip-private-text callback)
-  (toolbar-insert-widget
-   toolbar widget :prepend :tooltip-text tooltip-text
-   :tooltip-private-text tooltip-private-text :callback callback))
-
-(defun toolbar-insert-item (toolbar text icon position &key tooltip-text
-			    tooltip-private-text callback)
-  (toolbar-insert-element
-   toolbar position :text text :icon icon :callback callback
-   :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text))
-
-(defun toolbar-append-item (toolbar text icon &key tooltip-text
-			    tooltip-private-text callback)
-  (toolbar-insert-item
-   toolbar text icon :append :callback callback
-   :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text))
-
-		       
-(defun toolbar-prepend-item (toolbar text icon &key tooltip-text
-			     tooltip-private-text callback)
-  (toolbar-insert-item
-   toolbar text icon :prepend :callback callback
-   :tooltip-text tooltip-text :tooltip-private-text tooltip-private-text))
 
 (defun toolbar-enable-tooltips (toolbar)
   (setf (toolbar-tooltips-p toolbar) t))
@@ -1525,137 +1343,30 @@
   (setf (toolbar-tooltips-p toolbar) nil))
 
 
-
-;;; Tree
-
-(define-foreign tree-new () tree)
-
-(define-foreign tree-append () nil
-  (tree tree)
-  (tree-item tree-item))
-
-(define-foreign tree-prepend () nil
-  (tree tree)
-  (tree-item tree-item))
-
-(define-foreign tree-insert () nil
-  (tree tree)
-  (tree-item tree-item)
+(defbinding toolbar-remove-space () nil
+  (toolbar toolbar)
   (position int))
 
-(define-foreign tree-remove-items () nil
-  (tree tree)
-  (items (double-list tree-item)))
-
-(define-foreign tree-clear-items () nil
-  (tree tree)
-  (start int)
-  (end int))
-
-(define-foreign tree-select-item () nil
-  (tree tree)
-  (item int))
-
-(define-foreign tree-unselect-item () nil
-  (tree tree)
-  (item int))
-
-(define-foreign tree-select-child () nil
-  (tree tree)
-  (tree-item tree-item))
-
-(define-foreign tree-unselect-child () nil
-  (tree tree)
-  (tree-item tree-item))
-
-(define-foreign tree-child-position () int
-  (tree tree)
-  (tree-item tree-item))
-
-(defun root-tree-p (tree)
-  (eq (tree-root-tree tree) tree))
-
-;; gtkglue.c
-(define-foreign tree-selection () (double-list tree-item)
-  (tree tree))
-
-
-
-;;; Calendar
-
-(define-foreign calendar-new () calendar)
-
-(define-foreign calendar-select-month () int
-  (calendar calendar)
-  (month unsigned-int)
-  (year unsigned-int))
-
-(define-foreign calendar-select-day () nil
-  (calendar calendar)
-  (day unsigned-int))
-
-(define-foreign calendar-mark-day () int
-  (calendar calendar)
-  (day unsigned-int))
-
-(define-foreign calendar-unmark-day () int
-  (calendar calendar)
-  (day unsigned-int))
-
-(define-foreign calendar-clear-marks () nil
-  (calendar calendar))
-
-(define-foreign calendar-display-options () nil
-  (calendar calendar)
-  (options calendar-display-options))
-
-(define-foreign ("gtk_calendar_get_date" calendar-date) () nil
-  (calendar calendar)
-  (year unsigned-int :out)
-  (month unsigned-int :out)
-  (day unsigned-int :out))
-
-(define-foreign calendar-freeze () nil
-  (calendar calendar))
-
-(define-foreign calendar-thaw () nil
-  (calendar calendar))
-
-
-
-;;; Drawing area
-
-; (define-foreign drawing-area-new () drawing-area)
-
-; (define-foreign ("gtk_drawing_area_size" %drawing-area-set-size) () nil
-;   (drawing-area drawing-area)
-;   (width int)
-;   (height int))
-
-; (defun (setf drawing-area-size) (size drawing-area)
-;   (%drawing-area-set-size drawing-area (svref size 0) (svref size 1))
-;   (values (svref size 0) (svref size 1)))
-
-; ;; gtkglue.c
-; (define-foreign ("gtk_drawing_area_get_size" drawing-area-size) () nil
-;   (drawing-area drawing-area)
-;   (width int :out)
-;   (height int :out))
-
-
-
-; ;;; Curve
+(defbinding toolbar-unset-icon-size () nil
+  (toolbar toolbar))
 
+(defbinding toolbar-unset-style () nil
+  (toolbar toolbar))
 
 
-; ;;; Editable
+;;; Editable
 
-(define-foreign editable-select-region (editable &optional (start 0) end) nil
+(defbinding editable-select-region (editable &optional (start 0) end) nil
   (editable editable)
   (start int)
   ((or end -1) int))
 
-(define-foreign editable-insert-text
+(defbinding editable-get-selection-bounds (editable) nil
+  (editable editable)
+  (start int :out)
+  (end int :out))
+
+(defbinding editable-insert-text
     (editable text &optional (position 0)) nil
   (editable editable)
   (text string)
@@ -1668,12 +1379,12 @@
 (defun editable-prepend-text (editable text)
   (editable-insert-text editable text 0))
 
-(define-foreign editable-delete-text (editable &optional (start 0) end) nil
+(defbinding editable-delete-text (editable &optional (start 0) end) nil
   (editable editable)
   (start int)
   ((or end -1) int))
 
-(define-foreign ("gtk_editable_get_chars" editable-text)
+(defbinding (editable-text "gtk_editable_get_chars")
     (editable &optional (start 0) end) string
   (editable editable)
   (start int)
@@ -1687,284 +1398,157 @@
     (editable-delete-text editable))
   text)
 
-(define-foreign editable-cut-clipboard () nil
+(defbinding editable-cut-clipboard () nil
   (editable editable))
 
-(define-foreign editable-copy-clipboard () nil
+(defbinding editable-copy-clipboard () nil
   (editable editable))
 
-(define-foreign editable-paste-clipboard () nil
-  (editable editable))
-
-(define-foreign editable-claim-selection () nil
-  (editable editable)
-  (claim boolean)
-  (time unsigned-int))
-
-(define-foreign editable-delete-selection () nil
+(defbinding editable-paste-clipboard () nil
   (editable editable))
 
-(define-foreign editable-changed () nil
+(defbinding editable-delete-selection () nil
   (editable editable))
 
 
 
-;;; Entry
-
-(define-foreign %entry-new() entry)
-
-(define-foreign %entry-new-with-max-length () entry
-  (max (unsigned 16)))
-
-(defun entry-new (&optional max)
-  (if max
-      (%entry-new-with-max-length max)
-    (%entry-new)))
-
-
 ;;; Spin button
 
-(define-foreign spin-button-new () spin-button
-  (adjustment adjustment)
-  (climb-rate single-float)
-  (digits unsigned-int))
-
 (defun spin-button-value-as-int (spin-button)
   (round (spin-button-value spin-button)))
 
-(define-foreign spin-button-spin () nil
+(defbinding spin-button-spin () nil
   (spin-button spin-button)
   (direction spin-type)
   (increment single-float))
 
-(define-foreign spin-button-update () nil
+(defbinding spin-button-update () nil
   (spin-button spin-button))
 
 
 
 ; ;;; Ruler
 
-(define-foreign ruler-set-range () nil
+(defbinding ruler-set-range () nil
   (ruler ruler)
   (lower single-float)
   (upper single-float)
   (position single-float)
   (max-size single-float))
 
-(define-foreign ruler-draw-ticks () nil
+(defbinding ruler-draw-ticks () nil
   (ruler ruler))
 
-(define-foreign ruler-draw-pos () nil
+(defbinding ruler-draw-pos () nil
   (ruler ruler))
 
 
 
-; ;;; Range
+;;; Range
 
-; (define-foreign range-draw-background () nil
-;   (range range))
+(defun range-lower (range)
+  (adjustment-lower (range-adjustment range)))
 
-; (define-foreign range-clear-background () nil
-;   (range range))
+(defun range-upper (range)
+  (adjustment-upper (range-adjustment range)))
 
-; (define-foreign range-draw-trough () nil
-;   (range range))
+(defun (setf range-lower) (value range)
+  (setf (adjustment-lower (range-adjustment range)) value))
 
-; (define-foreign range-draw-slider () nil
-;   (range range))
+(defun (setf range-upper) (value range)
+  (setf (adjustment-upper (range-adjustment range)) value))
 
-; (define-foreign range-draw-step-forw () nil
-;   (range range))
+(defun range-page-increment (range)
+  (adjustment-page-increment (range-adjustment range)))
 
-; (define-foreign range-slider-update () nil
-;   (range range))
+(defun range-step-increment (range)
+  (adjustment-step-increment (range-adjustment range)))
 
-; (define-foreign range-trough-click () int
-;   (range range)
-;   (x int)
-;   (y int)
-;   (jump-perc single-float :out))
+(defun (setf range-page-increment) (value range)
+  (setf (adjustment-page-increment (range-adjustment range)) value))
 
-; (define-foreign range-default-hslider-update () nil
-;   (range range))
+(defun (setf range-step-increment) (value range)
+  (setf (adjustment-step-increment (range-adjustment range)) value))
 
-; (define-foreign range-default-vslider-update () nil
-;   (range range))
+(defbinding range-set-range () nil
+  (range range)
+  (lower double-float)
+  (upper double-float))
 
-; (define-foreign range-default-htrough-click () int
-;   (range range)
-;   (x int)
-;   (y int)
-;   (jump-perc single-float :out))
+(defbinding range-set-increments () nil
+  (range range)
+  (step double-float)
+  (page double-float))
 
-; (define-foreign range-default-vtrough-click () int
-;   (range range)
-;   (x int)
-;   (y int)
-;   (jump-perc single-float :out))
 
-; (define-foreign range-default-hmotion () int
-;   (range range)
-;   (x-delta int)
-;   (y-delta int))
+;;; Scale
 
-; (define-foreign range-default-vmotion () int
-;   (range range)
-;   (x-delta int)
-;   (y-delta int))
-
-
-
-; ;;; Scale
-
-; (define-foreign scale-draw-value () nil
+; (defbinding scale-draw-value () nil
 ;   (scale scale))
 
-; (define-foreign hscale-new () hscale
-;   (adjustment adjustment))
-
-; (define-foreign vscale-new () hscale
-;   (adjustment adjustment))
-
-
-
-; ;;; Scrollbar
-
-; (define-foreign hscrollbar-new () hscrollbar
-;   (adjustment adjustment))
-
-; (define-foreign vscrollbar-new () vscrollbar
-;   (adjustment adjustment))
-
-
-
-; ;;; Separator
-
-(define-foreign vseparator-new () vseparator)
-
-(define-foreign hseparator-new () hseparator)
-
 
 
-; ;;; Preview
+;;; Progress bar
 
+(defbinding progress-bar-pulse () nil
+  (progress-bar progress-bar))
 
 
-; ;;; Progress
 
-; (define-foreign progress-configure () adjustment
-;   (progress progress)
-;   (value single-float)
-;   (min single-float)
-;   (max single-float))
+;;; Stock items
 
-; (define-foreign ("gtk_progress_get_text_from_value"
-; 		  progress-text-from-value) () string
-;   (progress progress))
-
-; (define-foreign ("gtk_progress_get_percentage_from_value"
-; 		  progress-percentage-from-value) () single-float
-;   (progress progress))
-
-
-
-; ;;; Progress bar
-
-; (define-foreign %progress-bar-new () progress-bar)
-
-; (define-foreign %progress-bar-new-with-adjustment () progress-bar
-;   (adjustment adjustment))
-
-; (defun progress-bar-new (&optional adjustment)
-;   (if adjustment
-;       (%progress-bar-new-with-adjustment adjustment)
-;     (%progress-bar-new)))
-
-; (define-foreign progress-bar-update () nil
-;   (progress-bar progress-bar)
-;   (percentage single-float))
-
-
-
-;;; Adjustment
-
-(define-foreign adjustment-new () adjustment
-  (value single-float)
-  (lower single-float)
-  (upper single-float)
-  (step-increment single-float)
-  (page-increment single-float)
-  (page-size single-float))
-
-(define-foreign adjustment-changed () nil
-  (adjustment adjustment))
-
-(define-foreign adjustment-value-changed () nil
-  (adjustment adjustment))
-
-(define-foreign adjustment-clamp-page () nil
-  (adjustment adjustment)
-  (lower single-float)
-  (upper single-float))
+(defbinding stock-lookup () boolean
+  (stock-id string)
+  ((make-instance 'stock-item) stock-item :return))
+  
 
 
 
 ;;; Tooltips
 
-; (define-foreign tooltips-new () tooltips)
+(defbinding tooltips-enable () nil
+  (tooltips tooltips))
 
-; (define-foreign tooltips-enable () nil
-;   (tooltips tooltips))
+(defbinding tooltips-disable () nil
+  (tooltips tooltips))
 
-; (define-foreign tooltips-disable () nil
-;   (tooltips tooltips))
+(defun (setf tooltips-enabled-p) (enable tooltips)
+  (if enable
+      (tooltips-enable tooltips)
+    (tooltips-disable tooltips)))
 
-; (define-foreign tooltips-set-tip () nil
-;   (tooltips tooltips)
-;   (widget widget)
-;   (tip-text string)
-;   (tip-private string))
-
-; (declaim (inline tooltips-set-colors-real))
-; (define-foreign ("gtk_tooltips_set_colors" tooltips-set-colors-real) () nil
-;   (tooltips tooltips)
-;   (background gdk:color)
-;   (foreground gdk:color))
-
-; (defun tooltips-set-colors (tooltips background foreground)
-;   (gdk:with-colors ((background background)
-; 	  	    (foreground foreground))
-;     (tooltips-set-colors-real tooltips background foreground)))
-
-; (define-foreign tooltips-force-window () nil
-;   (tooltips tooltips))
+(defbinding tooltips-set-tip () nil
+  (tooltips tooltips)
+  (widget widget)
+  (tip-text string)
+  (tip-private string))
 
+(defbinding tooltips-force-window () nil
+  (tooltips tooltips))
 
 
 
-; ;;; Rc
+;;; Rc
 
-; (define-foreign rc-add-default-file (filename) nil
-;   ((namestring (truename filename)) string))
+(defbinding rc-add-default-file (filename) nil
+  ((namestring (truename filename)) string))
 
-; (define-foreign rc-parse (filename) nil
-;   ((namestring (truename filename)) string))
+(defbinding rc-parse (filename) nil
+  ((namestring (truename filename)) string))
 
-; (define-foreign rc-parse-string () nil
-;   (rc-string string))
+(defbinding rc-parse-string () nil
+  (rc-string string))
 
-; (define-foreign rc-reparse-all () nil)
+(defbinding rc-reparse-all () nil)
 
-; ;(define-foreign rc-get-style () style
-; ;  (widget widget))
+(defbinding rc-get-style () style
+  (widget widget))
 
 
 
 ;;; Accelerator Groups
-
-(define-foreign accel-group-new () accel-group)
-
-(define-foreign accel-group-get-default () accel-group)
+#|
+(defbinding accel-group-get-default () accel-group)
 
 (deftype-method alien-ref accel-group (type-spec)
   (declare (ignore type-spec))
@@ -1974,55 +1558,55 @@
   (declare (ignore type-spec))
   '%accel-group-unref)
 
-(define-foreign %accel-group-ref () accel-group
+(defbinding %accel-group-ref () accel-group
   (accel-group (or accel-group pointer)))
 
-(define-foreign %accel-group-unref () nil
+(defbinding %accel-group-unref () nil
   (accel-group (or accel-group pointer)))
 
-(define-foreign accel-group-activate (accel-group key modifiers) boolean
+(defbinding accel-group-activate (accel-group key modifiers) boolean
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(define-foreign accel-groups-activate (object key modifiers) boolean
+(defbinding accel-groups-activate (object key modifiers) boolean
   (object object)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(define-foreign accel-group-attach () nil
+(defbinding accel-group-attach () nil
   (accel-group accel-group)
   (object object))
 
-(define-foreign accel-group-detach () nil
+(defbinding accel-group-detach () nil
   (accel-group accel-group)
   (object object))
 
-(define-foreign accel-group-lock () nil
+(defbinding accel-group-lock () nil
   (accel-group accel-group))
 
-(define-foreign accel-group-unlock () nil
+(defbinding accel-group-unlock () nil
   (accel-group accel-group))
 
 
 ;;; Accelerator Groups Entries
 
-(define-foreign accel-group-get-entry (accel-group key modifiers) accel-entry
+(defbinding accel-group-get-entry (accel-group key modifiers) accel-entry
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(define-foreign accel-group-lock-entry (accel-group key modifiers) nil
+(defbinding accel-group-lock-entry (accel-group key modifiers) nil
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(define-foreign accel-group-unlock-entry (accel-group key modifiers) nil
+(defbinding accel-group-unlock-entry (accel-group key modifiers) nil
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
 
-(define-foreign accel-group-add
+(defbinding accel-group-add
     (accel-group key modifiers flags object signal) nil
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
@@ -2031,7 +1615,7 @@
   (object object)
   ((name-to-string signal) string))
 
-(define-foreign accel-group-add (accel-group key modifiers object) nil
+(defbinding accel-group-add (accel-group key modifiers object) nil
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type)
@@ -2040,7 +1624,7 @@
 
 ;;; Accelerator Signals
 
-(define-foreign accel-group-handle-add
+(defbinding accel-group-handle-add
     (object signal-id accel-group key modifiers flags) nil
   (object object)
   (signal-id unsigned-int)
@@ -2049,102 +1633,10 @@
   (modifiers gdk:modifier-type)
   (flags accel-flags))
 
-(define-foreign accel-group-handle-remove
+(defbinding accel-group-handle-remove
     (object accel-group key modifiers) nil
   (object object)
   (accel-group accel-group)
   ((gdk:keyval-from-name key) unsigned-int)
   (modifiers gdk:modifier-type))
-
-
-
-;;; Style
-
-; (define-foreign style-new () style)
-
-; (define-foreign style-copy () style
-;   (style style))
-
-; (define-foreign style-ref () style
-;   (style style))
-
-; (define-foreign style-unref () nil
-;   (style style))
-
-; (define-foreign style-get-color () gdk:color
-;   (style style)
-;   (color-type color-type)
-;   (state-type state-type))
-
-; (define-foreign
-;     ("gtk_style_set_color" style-set-color-from-color) () gdk:color
-;   (style style)
-;   (color-type color-type)
-;   (state-type state-type)
-;   (color gdk:color))
-
-; (defun style-set-color (style color-type state-type color)
-;   (gdk:with-colors ((color color))
-;     (style-set-color-from-color style color-type state-type color)))
-
-; (define-foreign ("gtk_style_get_font" style-font) () gdk:font
-;   (style style))
-
-; (define-foreign style-set-font () gdk:font
-;   (style style)
-;   (font gdk:font))
-
-; (defun (setf style-font) (font style)
-;   (let ((font (gdk:ensure-font font)))
-;     (gdk:font-unref (style-font style))
-;     (style-set-font style font)))
-
-; (defun style-fg (style state)
-;   (style-get-color style :foreground state))
-
-; (defun (setf style-fg) (color style state)
-;   (style-set-color style :foreground state color))
-
-; (defun style-bg (style state)
-;   (style-get-color style :background state))
-
-; (defun (setf style-bg) (color style state)
-;   (style-set-color style :background state color))
-
-; (defun style-text (style state)
-;   (style-get-color style :text state))
-
-; (defun (setf style-text) (color style state)
-;   (style-set-color style :text state color))
-
-; (defun style-base (style state)
-;   (style-get-color style :base state))
-
-; (defun (setf style-base) (color style state)
-;   (style-set-color style :base state color))
-
-; (defun style-white (style)
-;   (style-get-color style :white :normal))
-
-; (defun (setf style-white) (color style)
-;   (style-set-color style :white :normal color))
-
-; (defun style-black (style)
-;   (style-get-color style :black :normal))
-
-; (defun (setf style-black) (color style)
-;   (style-set-color style :black :normal color))
-
-; (define-foreign style-get-gc
-;     (style color-type &optional (state-type :normal)) gdk:gc
-;   (style style)
-;   (color-type color-type)
-;   (state-type state-type))
-
-
-
-
-
-
-
-
+|#