X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/e5b416f0bf3ae76b7a0ebd85ec681b483ccf0bd6..34ee84dfba62e878c218e543f99bedf9b093bb3f:/gtk/gtk.lisp?ds=sidebyside

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 77070c6..7136731 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -15,7 +15,7 @@
 ;; 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.6 2001-10-21 23:22:04 espen Exp $
+;; $Id: gtk.lisp,v 1.12 2002-04-02 15:03:47 espen Exp $
 
 
 (in-package "GTK")
@@ -39,15 +39,10 @@ (defun gtk-version ()
 	(format nil "Gtk+ v~A.~A" major minor) 
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
+(defbinding get-default-language () string)
 
 
-;;; Label
-
-(defbinding label-select-region () nil
-  (label label)
-  (start int)
-  (end int))
-
+;;; Acccel group
 
 
 ;;; Acccel label
@@ -56,20 +51,84 @@ (defbinding accel-label-refetch () boolean
   (accel-label accel-label))
 
 
+;;; Adjustment
+
+(defbinding adjustment-changed () nil
+  (adjustment adjustment))
+
+(defbinding adjustment-value-changed () nil
+  (adjustment adjustment))
+
+(defbinding adjustment-clamp-page () nil
+  (adjustment adjustment)
+  (lower single-float)
+  (upper single-float))
+
+
+;;; Arrow -- no functions
+
 
-;;; Bin
 
-(defbinding (bin-child "gtk_bin_get_child") () widget
-  (bin bin))
+;;; Aspect frame
+
+
+;;; 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
+
+
+
+;;; Box
+
+(defbinding box-pack-start () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int))
+
+(defbinding box-pack-end () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int))
+
+(defun box-pack (box child &key from-end (expand t) (fill t) (padding 0))
+  (if from-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))
+
+(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))
+
+(defbinding box-set-child-packing () nil
+  (box box)
+  (child widget)
+  (expand boolean)
+  (fill boolean)
+  (padding unsigned-int)
+  (pack-type pack-type))
+
+
+
 ;;; Button
 
 (defbinding button-pressed () nil
@@ -89,19 +148,270 @@ (defbinding button-leave () nil
 
 
 
-;;; Toggle button
+;;; Calendar
 
-(defbinding toggle-button-toggled () nil
-  (toggle-button toggle-button))
+(defbinding calendar-select-month () int
+  (calendar calendar)
+  (month unsigned-int)
+  (year unsigned-int))
+
+(defbinding calendar-select-day () nil
+  (calendar calendar)
+  (day unsigned-int))
 
+(defbinding calendar-mark-day () int
+  (calendar calendar)
+  (day unsigned-int))
 
+(defbinding calendar-unmark-day () int
+  (calendar calendar)
+  (day unsigned-int))
 
-;;; Check button
+(defbinding calendar-clear-marks () nil
+  (calendar calendar))
 
-(defmethod (setf button-label) ((label string) (button check-button))
+(defbinding calendar-display-options () nil
+  (calendar calendar)
+  (options calendar-display-options))
+
+(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))
+
+
+
+;;; Cell editable
+
+
+
+;;; Cell renderer
+
+
+
+;;; Cell renderer pixbuf -- no functions
+
+
+
+;;; Cell renderer text
+
+
+
+;;; Cell renderer toggle -- no functions
+
+
+
+;;; Check button -- no functions
+
+
+
+;;; Check menu item
+
+(defbinding check-menu-item-toggled () nil
+  (check-menu-item check-menu-item))
+
+
+
+;;; Clipboard
+
+
+;;; Color selection
+
+(defbinding (color-selection-is-adjusting-p
+	     "gtk_color_selection_is_adjusting") () boolean
+  (colorsel color-selection))
+
+
+
+;;; Color selection dialog -- no functions
+
+
+
+;;; Combo
+
+(defmethod shared-initialize ((combo combo) names &rest initargs
+			      &key popdown-strings)
   (call-next-method)
-  (setf (misc-xalign (bin-child button)) 0.0)
-  label)
+  (when popdown-strings
+    (combo-set-popdown-strings combo popdown-strings)))
+			    
+(defbinding combo-set-popdown-strings () nil
+  (combo combo)
+  (strings (glist string)))
+
+(defbinding combo-disable-activate () nil
+  (combo combo))
+
+
+
+;;;; Dialog
+
+(defmethod shared-initialize ((dialog dialog) names &rest initargs)
+  (call-next-method)
+  (dolist (button-definition (get-all initargs :button))
+    (apply #'dialog-add-button dialog button-definition)))
+  
+
+(defvar %*response-id-key* (gensym))
+
+(defun %dialog-find-response-id-num (dialog response-id &optional create-p error-p)
+  (or
+   (cadr (assoc response-id (rest (type-expand-1 'response-type))))
+   (let* ((response-ids (object-data dialog %*response-id-key*))
+	  (response-id-num (position response-id response-ids)))
+    (cond
+     (response-id-num)
+     (create-p
+      (cond
+       (response-ids
+	(setf (cdr (last response-ids)) (list response-id))
+	(1- (length response-ids)))
+       (t
+	(setf (object-data dialog %*response-id-key*) (list response-id))
+	0)))
+     (error-p
+      (error "Invalid response: ~A" response-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 #'equalp))
+    (nth response-id-num (object-data dialog %*response-id-key*))))
+
+
+(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))
+    (t
+     (call-next-method)))))
+
+
+(defbinding dialog-run () nil
+  (dialog dialog))
+
+(defbinding dialog-response (dialog response-id) nil
+  (dialog dialog)
+  ((%dialog-find-response-id-num dialog response-id nil t) int))
+
+
+(defbinding %dialog-add-button () button
+  (dialog dialog)
+  (text string)
+  (response-id-num int))
+
+(defun dialog-add-button (dialog label &optional response-id default-p)
+  (let* ((response-id-num
+	  (if response-id
+	      (%dialog-find-response-id-num dialog response-id t)
+	    (length (object-data dialog %*response-id-key*))))
+	 (button (%dialog-add-button dialog label response-id-num)))
+    (unless response-id
+      (%dialog-find-response-id-num dialog button t))
+    (when default-p
+      (%dialog-set-default-response dialog response-id-num))
+    button))
+
+
+(defbinding %dialog-add-action-widget () button
+  (dialog dialog)
+  (action-widget widget)
+  (response-id-num int))
+
+(defun dialog-add-action-widget (dialog widget &optional (response-id widget)
+				 default-p)
+  (let ((response-id-num (%dialog-find-response-id-num dialog response-id t)))
+    (%dialog-add-action-widget dialog widget response-id-num)
+    (when default-p
+      (%dialog-set-default-response dialog response-id-num))
+    widget))
+
+
+(defbinding %dialog-set-default-response () nil
+  (dialog dialog)
+  (response-id-num int))
+
+(defun dialog-set-default-response (dialog response-id)
+  (%dialog-set-default-response
+   dialog (%dialog-find-response-id-num dialog response-id nil t)))
+
+(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))
+
+
+;; Addition dialog functions
+
+(defmethod container-add ((dialog dialog) (child widget) &rest args)
+  (apply #'container-add (slot-value dialog 'main-area) child args))
+
+(defmethod container-remove ((dialog dialog) (child widget))
+  (container-remove (slot-value dialog 'main-area) child))
+
+(defmethod container-children ((dialog dialog))
+  (container-children (dialog-main-area dialog)))
+
+(defmethod (setf container-children) (children (dialog dialog))
+  (setf (container-children (dialog-main-area dialog)) children))
+
+
+
+;;; Drawing area -- no functions
+
+
+;;; Entry
+
+(defbinding  entry-get-layout () pango:layout
+  (entry entry))
+
+(defbinding entry-get-layout-offsets () nil
+  (entry entry)
+  (x int :out)
+  (y int :out))
+
+
+
+;;; Label
+
+(defbinding label-get-layout-offsets () nil
+  (labe label)
+  (x int :out)
+  (y int :out))
+
+(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))
+
+(defbinding  label-get-selection-bounds () boolean
+  (label label)
+  (start int :out)
+  (end int :out))
 
 
 
@@ -124,7 +434,7 @@ (defmethod initialize-instance ((button radio-button)
   (declare (ignore initargs))
   (call-next-method)
   (when group-with
-    (radio-button-add-to-group item group-with)))
+    (radio-button-add-to-group button group-with)))
 
 
 ;;; Option menu
@@ -165,6 +475,11 @@ (defun (setf menu-item-label) (label menu-item)
    :visible t :parent menu-item)
   label)
 
+(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))
@@ -178,6 +493,10 @@ (defun (setf menu-item-submenu) (submenu menu-item)
     (%menu-item-set-submenu menu-item submenu))
   submenu)
 
+(defbinding menu-item-set-accel-path () nil
+  (menu-item menu-item)
+  (accel-path string))
+
 (defbinding menu-item-select () nil
   (menu-item menu-item))
 
@@ -187,12 +506,13 @@ (defbinding menu-item-deselect () nil
 (defbinding menu-item-activate () nil
   (menu-item menu-item))
 
+(defbinding menu-item-toggle-size-request () nil
+  (menu-item menu-item)
+  (requisition int :out))
 
-
-;;; Check menu item
-
-(defbinding check-menu-item-toggled () nil
-  (check-menu-item check-menu-item))
+(defbinding menu-item-toggle-size-allocate () nil
+  (menu-item menu-item)
+  (allocation int))
 
 
 
@@ -212,29 +532,27 @@ (defun radio-menu-item-add-to-group (item1 item2)
 (defmethod initialize-instance ((item radio-menu-item)
 				&rest initargs &key group-with)
   (declare (ignore initargs))
-  (call-next-method)
-  (when group-with
-    (radio-menu-item-add-to-group item group-with)))
+  (prog1
+      (call-next-method)
+    (when group-with
+      (radio-menu-item-add-to-group item group-with))))
   
 
 
+;;; Toggle button
+
+(defbinding toggle-button-toggled () nil
+  (toggle-button toggle-button))
+
+
+
 ;;; Window
 
-(defbinding %window-set-wmclass () nil
+(defbinding 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)))
-
-;; gtkglue.c
-(defbinding window-wmclass () nil
-  (window window)
-  (wmclass-name string :out)
-  (wmclass-class string :out))
-
 (defbinding window-add-accel-group () nil
   (window window)
   (accel-group accel-group))
@@ -249,149 +567,152 @@ (defbinding window-activate-focus () int
 (defbinding window-activate-default () int
   (window window))
 
-(defbinding window-set-transient-for () nil
+(defbinding window-set-default-size (window width height) int
   (window window)
-  (parent window))
+  ((or width -1) int)
+  ((or height -1) int))
 
 ;(defbinding window-set-geometry-hints)
 
+(defbinding window-list-toplevels () (glist window))
 
+(defbinding window-add-mnemonic (window key target) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (target widget))
 
-;;; File selection
+(defbinding window-remove-mnemonic (window key target) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (target widget))
 
-(defbinding file-selection-complete () nil
-  (file-selection file-selection)
-  (pattern string))
+(defbinding window-mnemonic-activate (window key modifier) nil
+  (window window)
+  ((gdk:keyval-from-name key) unsigned-int)
+  (modifier gdk:modifier-type))
 
+(defbinding window-present () nil
+  (window window))
 
+(defbinding window-iconify () nil
+  (window window))
 
-;;; Scrolled window
+(defbinding window-deiconify () nil
+  (window window))
 
-(defun (setf scrolled-window-scrollbar-policy) (policy window)
-  (setf (scrolled-window-hscrollbar-policy window) policy)
-  (setf (scrolled-window-vscrollbar-policy window) policy))
+(defbinding window-stick () nil
+  (window window))
 
-(defbinding scrolled-window-add-with-viewport () nil
-   (scrolled-window scrolled-window)
-   (child widget))
+(defbinding window-unstick () nil
+  (window window))
 
+(defbinding window-maximize () nil
+  (window window))
 
+(defbinding window-unmaximize () nil
+  (window window))
 
-;;; Box
+(defbinding window-begin-resize-drag () nil
+  (window window)
+  (edge gdk:window-edge)
+  (button int)
+  (root-x int) (root-y int)
+  (timestamp (unsigned-int 32)))
 
-(defbinding box-pack-start () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding 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 32)))
 
-(defbinding box-pack-end () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding unsigned-int))
+(defbinding window-set-frame-dimensions () nil
+  (window window)
+  (left int) (top int) (rigth int) (bottom int))
 
-(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 (window-default-icons "gtk_window_get_default_icon_list")
+    () (glist gdk:pixbuf))
 
-(defbinding box-reorder-child () nil
-  (box box)
-  (child widget)
-  (position int))
+(defbinding %window-get-default-size () nil
+  (window window)
+  (width int :out)
+  (height int :out))
 
-(defbinding 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))
+(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 box-set-child-packing () nil
-  (box box)
-  (child widget)
-  (expand boolean)
-  (fill boolean)
-  (padding unsigned-int)
-  (pack-type pack-type))
+(defbinding window-get-frame-dimensions () nil
+  (window window)
+  (left int :out) (top int :out) (rigth int :out) (bottom int :out))
 
+(defbinding %window-get-icon-list () (glist gdk:pixbuf)
+  (window window))
 
+(defmethod window-icon ((window window))
+  (let ((icon-list (%window-get-icon-list window)))
+    (if (endp (rest icon-list))
+	(first icon-list)
+      icon-list)))
 
-;;; Button box
+(defbinding window-get-position () nil
+  (window window)
+  (root-x int :out)
+  (root-y int :out))
 
-(defbinding button-box-get-child-size () nil
-  (button-box button-box)
-  (min-width int :out)
-  (min-height int :out))
+(defbinding window-get-size () nil
+  (window window)
+  (width int :out)
+  (height int :out))
+
+(defbinding window-move () nil
+  (window window)
+  (x int)
+  (y int))
 
-(defbinding button-box-set-child-size () nil
-  (button-box button-box)
-  (min-width int)
-  (min-height int))
+(defbinding window-parse-geometry () boolean
+  (window window)
+  (geometry string))
 
-(defbinding button-box-get-child-ipadding () nil
-  (button-box button-box)
-  (ipad-x int :out)
-  (ipad-y int :out))
+(defbinding window-reshow-with-initial-size () nil
+  (window window))
 
-(defbinding button-box-set-child-ipadding () nil
-  (button-box button-box)
-  (ipad-x int)
-  (ipad-y int))
+(defbinding window-resize () nil
+  (window window)
+  (width int)
+  (heigth int))
 
+(defbinding %window-set-icon-list () nil
+  (window window)
+  (icon-list (glist gdk:pixbuf)))
 
+(defmethod (setf window-icon) (icon (window window))
+  (%window-set-icon-list window (mklist icon)))
 
-;;; Color selection
 
-; (defbinding %color-selection-get-previous-color () nil
-;   (colorsel color-selection)
-;   (color pointer))
 
-; (defun color-selection-previous-color (colorsel)
-;   (let ((color (allocate-memory (* (size-of 'double-float) 4))))
-;     (%color-selection-get-previous-color colorsel color)
-;     (funcall (get-from-alien-function '(vector double-float 4)) color)))
 
-; (defbinding %color-selection-set-previous-color () nil
-;   (colorsel color-selection)
-;   (color (vector double-float 4)))
+;;; File selection
 
-; (defun (setf color-selection-previous-color) (color colorsel)
-;   (%color-selection-set-previous-color colorsel color)
-;   color)
+(defbinding file-selection-complete () nil
+  (file-selection file-selection)
+  (pattern string))
 
-(defbinding (color-selection-is-adjusting-p
-	     "gtk_color_selection_is_adjusting") () boolean
-  (colorsel color-selection))
 
 
+;;; Scrolled window
 
-;;; Combo
+(defun (setf scrolled-window-scrollbar-policy) (policy window)
+  (setf (scrolled-window-hscrollbar-policy window) policy)
+  (setf (scrolled-window-vscrollbar-policy window) policy))
 
-(defbinding 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))
 
-; (defbinding ("gtk_combo_set_item_string" (setf combo-item-string)) () nil
-;   (combo combo)
-;   (item item)
-;   (item-value string))
 
-(defbinding %combo-set-popdown-strings () nil
-  (combo combo)
-  (strings (glist string)))
 
-(defun (setf combo-popdown-strings) (strings combo)
-  (%combo-set-popdown-strings combo strings)
-  strings)
 
-(defbinding combo-disable-activate () nil
-  (combo combo))
 
 
 
@@ -423,62 +744,63 @@ (defbinding statusbar-remove () nil
 (defbinding fixed-put () nil
   (fixed fixed)
   (widget widget)
-  (x (signed 16))
-  (y (signed 16)))
+  (x int) (y int))
 
 (defbinding fixed-move () nil
   (fixed fixed)
   (widget widget)
-  (x (signed 16))
-  (y (signed 16)))
+  (x int) (y int))
 
 
 
 ;;; Notebook
 
-(defbinding (notebook-insert-page "gtk_notebook_insert_page_menu")
+(defun %notebook-position (notebook page)
+  (etypecase page
+    (int page)
+    (keyword (case page
+	       (:first 0)
+	       (:last -1)
+	       (error "Invalid position keyword: ~A" page)))
+    (widget (notebook-page-num notebook page t))))
+
+(defun %notebook-child (notebook position)
+  (typecase position
+     (widget position)
+     (t (notebook-nth-page-child notebook position))))
+
+
+(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))
+  ((%notebook-position notebook 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-append (notebook child tab-label &optional menu-label)
+  (notebook-insert notebook :last 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))
+(defun notebook-prepend (notebook child tab-label &optional menu-label)
+  (notebook-insert notebook :first child tab-label menu-label))
   
-(defbinding notebook-remove-page () nil
+(defbinding notebook-remove-page (notebook 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)))
-
-(defbinding (notebook-nth-page-child "gtk_notebook_get_nth_page") () widget
-  (notebook notebook)
-  (page-num int))
-
-(defun notebook-page-child (notebook)
-  (notebook-nth-page-child notebook (notebook-page notebook)))
+  ((%notebook-position notebook position) int))
 
 (defbinding %notebook-page-num () int
   (notebook notebook)
   (child widget))
 
-(defun notebook-child-num (notebook child)
+(defun notebook-page-num (notebook child &optional error-p)
   (let ((page-num (%notebook-page-num notebook child)))
     (if (= page-num -1)
-	nil
+	(when error-p
+	  (error "~A is not a child of ~A" child notebook))
       page-num)))
 
 (defbinding notebook-next-page () nil
@@ -487,88 +809,101 @@ (defbinding notebook-next-page () nil
 (defbinding notebook-prev-page () nil
   (notebook notebook))
 
+(defbinding notebook-reorder-child (notebook child position) nil
+  (notebook notebook)
+  (child widget)
+  ((%notebook-position notebook position) int))
+
 (defbinding notebook-popup-enable () nil
   (notebook notebook))
 
 (defbinding notebook-popup-disable () nil
   (notebook notebook))
 
-; (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
-;     (notebook ref) widget
-;   (notebook notebook)
-;   ((if (typep ref 'widget)
-;        ref
-;      (notebook-nth-page-child notebook ref))
-;    widget))
-
-; (defbinding %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)
-;     tab-label-widget))
-   
-; (defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
-;     (notebook ref) widget
-;   (notebook notebook)
-;   ((if (typep ref 'widget)
-;        ref
-;      (notebook-nth-page-child notebook ref))
-;    widget))
-
-; (defbinding %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)
-;     menu-label-widget))
-
-(defbinding notebook-query-tab-label-packing (notebook ref) nil
+(defbinding (notebook-nth-page-child "gtk_notebook_get_nth_page")
+    (notebook page) widget
+  (notebook notebook)
+  ((case page
+     (:first 0)
+     (:last -1)
+     (t page)) int))
+
+(defbinding (notebook-current-page-num "gtk_notebook_get_current_page") () int
+  (notebook notebook))
+
+(defun notebook-current-page (notebook)
+  (notebook-nth-page-child notebook (notebook-current-page-num notebook)))
+
+(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)
+
+
+;; (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
+;;     (notebook page) widget
+;;   (notebook notebook)
+;;   ((%notebook-child notebook page) widget))
+
+;; (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
+;;     (notebook page) string
+;;   (notebook notebook)
+;;   ((%notebook-child notebook page) widget))
+
+;; (defbinding %notebook-set-tab-label () nil
+;;   (notebook notebook)
+;;   (page widget)
+;;   (tab-label widget))
+
+;; (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))
+
+
+;; (defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
+;;     (notebook page) widget
+;;   (notebook notebook)
+;;   ((%notebook-child notebook page) widget))
+
+;; (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
+;;     (notebook page) string
+;;   (notebook notebook)
+;;   ((%notebook-child notebook page) widget))
+
+;; (defbinding %notebook-set-menu-label () nil
+;;   (notebook notebook)
+;;   (page widget)
+;;   (menu-label widget))
+
+;; (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))
+
+
+(defbinding notebook-query-tab-label-packing (notebook page) nil
   (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget)
+  ((%notebook-child notebook page) widget)
   (expand boolean :out)
   (fill boolean :out)
   (pack-type pack-type :out))
 
-(defbinding
-    notebook-set-tab-label-packing (notebook ref expand fill pack-type) nil
+(defbinding notebook-set-tab-label-packing
+    (notebook page expand fill pack-type) nil
   (notebook notebook)
-  ((if (typep ref 'widget)
-       ref
-     (notebook-nth-page-child notebook ref))
-   widget)
+  ((%notebook-child notebook page) widget)
   (expand boolean)
   (fill boolean)
   (pack-type pack-type))
 
-(defbinding notebook-reorder-child () nil
-  (notebook notebook)
-  (child widget)
-  (position int))
-
 
 
 ;;; Paned
@@ -585,24 +920,26 @@ (defbinding paned-pack2 () nil
   (resize boolean)
   (shrink boolean))
 
-;; gtkglue.c
+(defun (setf paned-child1) (child paned)
+  (paned-pack1 paned child nil t)
+  child)
+
+(defun (setf paned-child2) (child paned)
+  (paned-pack2 paned child t t)
+  child)
+
+;; Defined in gtkglue.c
 (defbinding paned-child1 () widget
   (paned paned)
   (resize boolean :out)
   (shrink boolean :out))
 
-;; gtkglue.c
+;; Defined in gtkglue.c
 (defbinding paned-child2 () widget
   (paned paned)
   (resize boolean :out)
   (shrink boolean :out))
 
-(defun (setf paned-child1) (child paned)
-  (paned-pack1 paned child nil t))
-
-(defun (setf paned-child2) (child paned)
-  (paned-pack2 paned child t t))
-
 
 
 ;;; Layout
@@ -619,30 +956,23 @@ (defbinding layout-move () nil
   (x int)
   (y int))
 
-(defbinding layout-set-size () nil
-  (layout layout)
-  (width int)
-  (height int))
-
-(defbinding layout-get-size () nil
-  (layout layout)
-  (width int :out)
-  (height int :out))
-
 
 
 ;;; Menu shell
 
-(defbinding 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))
 
 (defbinding menu-shell-deactivate () nil
   (menu-shell menu-shell))
@@ -661,24 +991,50 @@ (defbinding menu-shell-activate-item () nil
 
 
 
-; ;;; Menu bar
-
-; (defbinding menu-bar-insert () nil
-;   (menu-bar menu-bar)
-;   (menu menu)
-;   (position int))
+;;; Menu
 
-; (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))
+(defun %menu-position (menu child)
+  (etypecase child
+    (int child)
+    (keyword (case child
+	       (:first 0)
+	       (:last -1)
+	       (error "Invalid position keyword: ~A" child)))
+    (widget (menu-child-position menu child))))
 
 
+(defbinding menu-reorder-child (menu menu-item position) nil
+  (menu menu)
+  (menu-item menu-item)
+  ((%menu-position menu position) int))
 
-; ;;; Menu
+(defvar *menu-position-callback-marshal*
+  (system:foreign-symbol-address "gtk_menu_position_callback_marshal"))
 
-;(defun menu-popup ...)
+(defbinding %menu-popup () nil
+  (menu menu)
+  (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
+      (let ((callback-id (register-callback-function callback)))
+	(unwind-protect
+	    (%menu-popup
+	     menu parent-menu-shell parent-menu-item
+	     *menu-position-callback-marshal* callback-id button activate-time)
+	  (destroy-user-data callback-id)))
+    (%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))
 
 (defbinding menu-reposition () nil
   (menu menu))
@@ -686,17 +1042,20 @@ (defbinding menu-reposition () nil
 (defbinding menu-popdown () nil
   (menu menu))
 
+(defun menu-child-position (menu child)
+  (position child (container-children menu)))
+
+(defun menu-active-num (menu)
+  (menu-child-position menu (menu-active menu)))
+
 (defbinding %menu-set-active () nil
   (menu menu)
   (index unsigned-int))
 
-(defun (setf menu-active) (menu index)
-  (%menu-set-active menu index))
+(defun (setf menu-active) (menu child)
+  (%menu-set-active menu (%menu-position menu child))
+  child)
   
-(defbinding menu-reorder-child () nil
-  (menu menu)
-  (menu-item menu-item)
-  (position int))
 
 
 ;;; Table
@@ -707,9 +1066,9 @@ (defbinding table-resize () nil
   (columns unsigned-int))
 
 (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
+			  &key (x-options '(:expand :fill))
+			       (y-options '(:expand :fill))
+			       (x-padding 0) (y-padding 0)) nil
   (table table)
   (child widget)
   (left unsigned-int)
@@ -778,133 +1137,9 @@ (defun table-col-spacing (table &optional col)
     (%table-get-default-col-spacing table)))
   
 
-;;; Dialog
-
-(defmethod initialize-instance ((dialog dialog) &rest initargs)
-  (apply #'call-next-method dialog (plist-remove initargs :child))
-  (dolist (button-definition (get-all initargs :button))
-    (apply #'dialog-add-button dialog button-definition))
-  (dolist (child (get-all initargs :child))
-    (apply #'dialog-add-child dialog (mklist child))))
-
-
-(defvar %*response-id-key* (gensym))
-
-(defun %dialog-find-response-id-num (dialog response-id create-p)
-  (or
-   (cadr (assoc response-id (rest (type-expand-1 'response-type))))
-   (let* ((response-ids (object-data dialog %*response-id-key*))
-	  (response-id-num (position response-id response-ids)))
-    (cond
-     (response-id-num)
-     (create-p
-      (cond
-       (response-ids
-	(setf (cdr (last response-ids)) (list response-id))
-	(1- (length response-ids)))
-       (t
-	(setf (object-data dialog %*response-id-key*) (list response-id))
-	0)))
-     (t
-      (error "Invalid response id: ~A" response-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 #'equalp))
-    (nth response-id-num (object-data dialog %*response-id-key*))))
-
-
-(defmethod signal-connect ((dialog dialog) signal function &key object)
-  (case signal
-    (response
-     #'(lambda (dialog response-id-num)
-	 (let ((response-id (%dialog-find-response-id dialog response-id-num)))
-	   (cond
-	    ((eq object t)  (funcall function dialog response-id))
-	    (object (funcall function object response-id))
-	    (t (funcall function response-id))))))
-    (t
-     (call-next-method))))
-
-
-(defbinding dialog-response (dialog response-id) nil
-  (dialog dialog)
-  ((%dialog-find-response-id-num dialog response-id nil) int))
-  
-(defbinding %dialog-set-default-response () nil
-  (dialog dialog)
-  (response-id-num int))
-
-(defun dialog-set-default-response (dialog response-id)
-  (%dialog-set-default-response
-   dialog (%dialog-find-response-id-num dialog response-id nil)))
-
-(defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
-  (dialog dialog)
-  ((%dialog-find-response-id-num dialog response-id nil) int)
-  (sensitive boolean))
-
-
-(defbinding %dialog-add-button () button
-  (dialog dialog)
-  (text string)
-  (response-id-num int))
-
-(defun dialog-add-button (dialog label &optional response-id default-p)
-  (let* ((response-id-num
-	  (if response-id
-	      (%dialog-find-response-id-num dialog response-id t)
-	    (length (object-data dialog %*response-id-key*))))
-	 (button (%dialog-add-button dialog label response-id-num)))
-    (unless response-id
-      (%dialog-find-response-id-num dialog button t))
-    (when default-p
-      (%dialog-set-default-response dialog response-id-num))
-    button))
-
-
-(defbinding %dialog-add-action-widget () button
-  (dialog dialog)
-  (action-widget widget)
-  (response-id-num int))
-
-(defun dialog-add-action-widget (dialog widget &optional (response-id widget)
-				 default-p)
-  (let ((response-id-num (%dialog-find-response-id-num dialog response-id t)))
-    (%dialog-add-action-widget dialog widget response-id-num)
-    (when default-p
-      (%dialog-set-default-response dialog response-id-num))
-    widget))
-  
-
-(defun dialog-add-child (dialog child &rest args)
-  (apply #'container-add (slot-value dialog 'vbox) child args))
-
-(defmethod container-children ((dialog dialog))
-  (container-children (dialog-vbox dialog)))
-
-(defmethod (setf container-children) (children (dialog dialog))
-  (setf (container-children (dialog-vbox dialog)) children))
-
-
 
 ;;; Toolbar
 
-;; gtkglue.c
-(defbinding 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)))
-
 (defbinding %toolbar-insert-element () widget
   (toolbar toolbar)
   (type toolbar-child-type)
@@ -917,80 +1152,77 @@ (defbinding %toolbar-insert-element () widget
   (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 0)
+		   (:last -1)
+		   (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 icon 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))
@@ -999,65 +1231,15 @@ (defun toolbar-disable-tooltips (toolbar)
   (setf (toolbar-tooltips-p toolbar) nil))
 
 
+(defbinding toolbar-remove-space () nil
+  (toolbar toolbar)
+  (position int))
 
-;;; Calendar
-
-(defbinding calendar-select-month () int
-  (calendar calendar)
-  (month unsigned-int)
-  (year unsigned-int))
-
-(defbinding calendar-select-day () nil
-  (calendar calendar)
-  (day unsigned-int))
-
-(defbinding calendar-mark-day () int
-  (calendar calendar)
-  (day unsigned-int))
-
-(defbinding calendar-unmark-day () int
-  (calendar calendar)
-  (day unsigned-int))
-
-(defbinding calendar-clear-marks () nil
-  (calendar calendar))
-
-(defbinding calendar-display-options () nil
-  (calendar calendar)
-  (options calendar-display-options))
-
-(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))
-
-
-
-;;; Drawing area
-
-
-; (defbinding ("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
-; (defbinding ("gtk_drawing_area_get_size" drawing-area-size) () nil
-;   (drawing-area drawing-area)
-;   (width int :out)
-;   (height int :out))
+(defbinding toolbar-unset-icon-size () nil
+  (toolbar toolbar))
 
+(defbinding toolbar-unset-style () nil
+  (toolbar toolbar))
 
 
 ;;; Editable
@@ -1223,18 +1405,12 @@ (defbinding progress-bar-pulse () nil
 
 
 
-;;; Adjustment
-
-(defbinding adjustment-changed () nil
-  (adjustment adjustment))
-
-(defbinding adjustment-value-changed () nil
-  (adjustment adjustment))
+;;; Stock items
 
-(defbinding adjustment-clamp-page () nil
-  (adjustment adjustment)
-  (lower single-float)
-  (upper single-float))
+(defbinding stock-lookup () boolean
+  (stock-id string)
+  (stock-item stock-item :out))
+