X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/2d379b6af32ac777df472ce9b4d1afd96905423a..b030f2d9b679b9b18db0356ab0f2a2086ea61939:/gtk/gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 8930390..41d998a 100644
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0.x
-;; Copyright (C) 1999-2000 Espen S. Johnsen <espejohn@online.no>
+;; Copyright (C) 1999-2001 Espen S. Johnsen <espen@users.sourceforge.org>
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -15,54 +15,50 @@
 ;; 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: gtktypes.lisp,v 1.2 2000-08-15 19:55:08 espen Exp $
-
+;; $Id: gtktypes.lisp,v 1.11 2002-03-19 19:09:18 espen Exp $
 
 
 (in-package "GTK")
 
+(defclass requisition (boxed)
+  ((width
+    :allocation :alien
+    :accessor requisition-width
+    :initarg :width
+    :type int)
+   (height
+    :allocation :alien
+    :accessor requisition-height
+    :initarg :height
+    :type int))
+  (:metaclass boxed-class)
+  (:alien-name "GtkTypeRequisition"))
 
-; (deftype color-type
-;   (enum
-;    :foreground
-;    :background
-;    :light
-;    :dark
-;    :mid
-;    :text
-;    :base
-;    :white
-;    :black))
-
-
-(defclass  style (gobject)
-  ()
-  (:metaclass gobject-class)
-  (:alien-name "GtkStyle"))
-
-
-(defclass accel-group (alien-object)
-  ()
-  (:metaclass alien-class)
-  (:alien-name "GtkAccelGroup"))
-
-(deftype accel-entry () 'pointer) ; internal?
-
-
-;; These types are actully a single linked lists of widgets. As long as
-;; we don't have to access the individual widgets defining them this way
-;; is adequate and most efficient.
-(deftype radio-button-group () 'pointer) 
-(deftype radio-menu-item-group () 'pointer)
-
-
-(defclass data (object)
-  ()
-  (:metaclass object-class)
-  (:alien-name "GtkData"))
-
+(defclass border (boxed)
+  ((left
+    :allocation :alien
+    :accessor border-left
+    :initarg :left
+    :type int)
+   (right
+    :allocation :alien
+    :accessor border-right
+    :initarg :right
+    :type int)
+   (top
+    :allocation :alien
+    :accessor border-top
+    :initarg :top
+    :type int)
+   (bottom
+    :allocation :alien
+    :accessor border-bottom
+    :initarg :bottom
+    :type int))
+  (:metaclass boxed-class)
+  (:alien-name "GtkTypeBorder"))
 
-(defclass adjustment (data)
+(defclass adjustment (%object)
   ((lower
     :allocation :alien
     :accessor adjustment-lower
@@ -73,10 +69,8 @@ (defclass adjustment (data)
     :accessor adjustment-upper
     :initarg :upper
     :type single-float)
-   (value
+   (%value ; to get the offset right
     :allocation :alien
-    :accessor adjustment-value
-    :initarg :value
     :type single-float)
    (step-increment
     :allocation :alien
@@ -92,1584 +86,355 @@ (defclass adjustment (data)
     :allocation :alien
     :accessor adjustment-page-size
     :initarg :page-size
-    :type single-float))
-  (:metaclass object-class)
-  (:alien-name "GtkAdjustment"))
-  
-
-(defclass tooltips (data)
-  ((delay
-    :allocation :virtual
-    :location ("gtk_tooltips_get_delay" "gtk_tooltips_set_delay")
-    :accessor tooltips-delay
-    :type unsigned-int)
-   (enabled
-    :allocation :virtual
-    :location ("gtk_tooltips_get_enabled" (setf tooltips-enabled-p))
-    :reader tooltips-enabled-p
-    :initarg :enabled
-    :type boolean))
-  (:metaclass object-class)
-  (:alien-name "GtkTooltips"))
-
-
-;; Forward declaration, the real definition is in gtkwidget.lisp
-(defclass widget (object)
-  ()
-  (:metaclass object-class)
-  (:alien-name "GtkWidget"))
-
-
-(defclass misc (widget)
-  ((xalign
-    :allocation :arg
-    :accessor misc-xalign
-    :initarg :xalign
-    :type single-float)
-   (yalign
-    :allocation :arg
-    :accessor misc-yalign
-    :initarg :yalign
     :type single-float)
-   (xpad
-    :allocation :arg
-    :accessor misc-xpad
-    :initarg :xpad
-    :type int)
-   (ypad
-    :allocation :arg
-    :accessor misc-ypad
-    :initarg :ypad
-    :type int))
-  (:metaclass widget-class)
-  (:alien-name "GtkMisc"))
-
-
-(defclass label (misc)
-  ((label
-    :allocation :arg
-    :accessor label-label
-    :initarg :label
-    :type string)
-   (pattern
-    :allocation :arg
-    :accessor label-pattern
-    :initarg :pattern
-    :type string)
-   (justify
-    :allocation :arg
-    :accessor label-justify
-    :initarg :justify
-    :type justification)
-   (wrap
-    :allocation :arg
-    :accessor label-line-wrap-p
-    :initarg :wrap
-    :type boolean))
-  (:metaclass widget-class)
-  (:alien-name "GtkLabel"))
-
-
-(defclass accel-label (label)
-  ((widget
-    :allocation :arg
-    :location "GtkAccelLabel::accel_widget"
-    :accessor accel-widget
-    :initarg :widget
-    :type widget)
-   (width
-    :allocation :virtual
-    :location "gtk_accel_label_get_accel_width"
-    :reader width
-    :type unsigned-int))
-  (:metaclass widget-class)
-  (:alien-name "GtkAccelLabel"))
-
-
-(defclass tips-query (label)
-  ((emit-always
-    :allocation :arg
-    :accessor tips-query-emit-always-p
-    :initarg :emit-always
-    :type boolean)
-   (caller
-    :allocation :arg
-    :accessor tips-query-caller
-    :initarg :caller
-    :type widget)
-   (label-inactive
-    :allocation :arg
-    :accessor tips-query-label-inactive
-    :initarg :label-inactive
-    :type string)
-   (label-no-tip
-    :allocation :arg
-    :accessor tips-query-label-no-tip
-    :initarg :label-no-tip
-    :type string))
-  (:metaclass widget-class)
-  (:alien-name "GtkTipsQuery"))
-
-
-(defclass arrow (misc)
-  ((arrow-type
-    :allocation :arg
-    :accessor arrow-arrow-type
-    :initarg :arrow-type
-    :type arrow-type)
-   (shadow-type
-    :allocation :arg
-    :accessor arrow-shadow-type
-    :initarg :shadow-type
-    :type shadow-type))
-  (:metaclass widget-class)
-  (:alien-name "GtkArrow"))
-
-
-(defclass image (misc)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkImage"))
-
-
-(defclass pixmap (misc)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkPixmap"))
-
-
-;; Forward declaration, the real definition is in gtkcontainer.lisp
-(defclass container (widget)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkContainer"))
-
-(defclass container-child ()
-  ((parent
-    :initarg :parent
-    :type container)
-   (child
-    :initarg :child
-    :type widget)))
-
-
-(defclass bin (container)
-  ((child
+   (value
     :allocation :virtual
-    :location bin-child
-    :initarg :child
-    :type widget))
-  (:metaclass container-class)
-  (:alien-name "GtkBin"))
-
-(defclass bin-child (container-child))
-
-
-(defclass alignment (bin)
-  ((xalign
-    :allocation :arg
-    :accessor alignment-xalign
-    :initarg :xalign
-    :type single-float)
-   (yalign
-    :allocation :arg
-    :accessor alignment-yalign
-    :initarg :yalign
-    :type single-float)
-   (xscale
-    :allocation :arg
-    :accessor alignment-xscale
-    :initarg :xscale
-    :type single-float)
-   (yscale
-    :allocation :arg
-    :accessor alignment-yscale
-    :initarg :yscale
+    :getter "gtk_adjustment_get_value"
+    :setter "gtk_adjustment_set_value"
+    :accessor adjustment-value
+    :initarg :value
     :type single-float))
-  (:metaclass container-class)
-  (:alien-name "GtkAlignment"))
-
-(defclass alignment-child (bin-child))
-
-
-(defclass frame (bin)
-  ((label
-    :allocation :arg
-    :accessor frame-label
-    :initarg :label
-    :type string)
-   (label-xalign
-    :allocation :arg
-    :accessor frame-label-xalign
-    :initarg :label-xalign
-    :type single-float)
-   (label-yalign
-    :allocation :arg
-    :accessor frame-label-yalign
-    :initarg :label-yalign
-    :type single-float)
-   (shadow-type
-    :allocation :arg
-    :location "GtkFrame::shadow"
-    :accessor frame-shadow-type
-    :initarg :shadow-type
-    :type shadow-type))
-  (:metaclass container-class)
-  (:alien-name "GtkFrame"))
-
-(defclass frame-child (bin-child))
-  
-
-; (defclass aspect-frame (frame)
-;   ((xalign
-;     :allocation :arg
-;     :accessor aspect-frame-xalign
-;     :initarg :xalign
-;     :type single-float)
-;    (yalign
-;     :allocation :arg
-;     :accessor aspect-frame-yalign
-;     :initarg :yalign
-;     :type single-float)
-;    (ratio
-;     :allocation :arg
-;     :accessor aspect-frame-ratio
-;     :initarg :ratio
-;     :type single-float)
-;    (obey-child
-;     :allocation :arg
-;     :accessor aspect-frame-obey-child-p
-;     :initarg :obey-child
-;     :type boolean))
-;   (:metaclass container-class)
-;   (:alien-name "GtkAspectFrame"))
-
-; (defclass aspect-frame-child (aspect-child))
-
-
-(defclass button (bin)
-  ((label
-    :allocation :arg
-    :accessor button-label
-    :initarg :label
-    :type string)
-   (relief
-    :allocation :arg
-    :accessor button-relief
-    :initarg :relief
-    :type relief-style))
-  (:metaclass container-class)
-  (:alien-name "GtkButton"))
-
-(defclass button-child (bin-child))
-  
-
-(defclass toggle-button (button)
-  ((active
-    :allocation :arg
-    :accessor toggle-button-active-p
-    :initarg :active
-    :type boolean)
-   (draw-indicator
-    :allocation :arg
-    :accessor toggle-button-draw-indicator-p
-    :initarg :draw-indicator
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkToggleButton"))
-
-(defclass toggle-button-child (button-child))
-
-
-(defclass check-button (toggle-button)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkCheckButton"))
+  (:metaclass gobject-class)
+  (:alien-name "GtkAdjustment"))
 
-(defclass check-button-child (toggle-button-child))
 
 
-(defclass radio-button (check-button)
-  ((group
-    :allocation :arg
-    :initarg :group
-;    :access :write-only
-    :type radio-button-group))
-  (:metaclass container-class)
-  (:alien-name "GtkRadioButton"))
+(define-types-by-introspection "Gtk"
+  ;; Manually defined
+  ("GtkObject" :ignore t)
+  ("GtkRequisition" :ignore t)
+  ("GtkBorder" :ignore t)
+  ("GtkAdjustment" :ignore t)
 
-(defclass radio-button-child (check-button-child))
   
-
-(defclass option-menu (button)
-  ((menu
-    :allocation :virtual
-    :location ("gtk_option_menu_get_menu" (setf option-menu-menu))
-    :reader option-menu-menu
-    :initarg :menu
-    :type widget)
-   (history
-    :allocation :virtual
-    :location (nil "gtk_option_menu_set_history")
-    :writer (setf option-menu-history)
-    :initarg :history
-    :type unsigned-int))
-  (:metaclass container-class)
-  (:alien-name "GtkOptionMenu"))
-
-(defclass option-menu-child (button-child))
-
-
-(defclass item (bin)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkOptionMenu"))
-
-(defclass item-child (bin-child))
-
-
-(defclass menu-item (item)
-  ((label
-    :allocation :virtual
-    :location menu-item-label
-    :initarg :label
-    :type string)
-   (submenu
-    :allocation :virtual
-    :location ("gtk_menu_item_get_submenu" (setf menu-item-submenu))
-    :reader menu-item-submenu
-    :initarg :submenu
-    :type menu-item)
-   (placement
-    :allocation :virtual
-    :location ("gtk_menu_item_get_placement" "gtk_menu_item_set_placement")
-    :accessor menu-item-placement
-    :initarg :placement
-    :type submenu-placement)
-   (toggle-indicator
-    :allocation :virtual
-    :location ("gtk_menu_item_get_show_toggle"
-	       (setf menu-item-toggle-indicator-p))
-    :reader menu-item-toggle-indicator-p
-    :initarg :toggle-indicator
-    :type boolean)
-   (submenu-indicator
-    :allocation :virtual
-    :location ("gtk_menu_item_get_show_submenu"
-	       (setf menu-item-submenu-indicator-p))
-    :reader menu-item-submenu-indicator-p
-    :initarg :submenu-indicator
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkMenuItem"))
+  ;; Manual override
+  ("GtkWidget"
+   :slots
+   ((child-slots
+    :allocation :instance
+    :accessor widget-child-slots
+    :type container-child)
+    (parent
+     :allocation :virtual
+     :getter "gtk_widget_get_parent"
+     :setter "gtk_widget_set_parent"
+     :accessor widget-parent
+     :type container
+     :documentation "The parent widget of this widget. Must be a container widget.")
+    (window
+     :allocation :virtual
+     :getter "gtk_widget_get_window"
+     :reader widget-window
+     :type gdk:window)
+    (state
+     :allocation :virtual
+     :getter "gtk_widget_get_state"
+     :setter "gtk_widget_set_state"
+     :accessor widget-state
+     :initarg :state
+     :type state-type)
+    (colormap
+     :allocation :virtual
+     :getter "gtk_widget_get_colormap"
+     :reader widget-colormap
+     :type gdk:colormap)
+    (visual
+     :allocation :virtual
+     :getter "gtk_widget_get_visual"
+     :reader widget-visual
+     :type gdk:visual)))
+
+  ("GtkContainer"
+   :slots
+   ((child
+     :ignore t)
+    (children
+     :allocation :virtual
+     :getter container-children
+     :setter (setf container-children))
+    (focus-child
+     :allocation :virtual
+     :getter "gtk_container_get_focus_child"
+     :setter "gtk_container_set_focus_child"
+     :accessor container-focus-child
+     :initarg :focus-child
+     :type widget)
+    (focus-hadjustment
+     :allocation :virtual
+     :getter "gtk_container_get_focus_hadjustment"
+     :setter "gtk_container_set_focus_hadjustment"
+     :accessor container-focus-hadjustment
+     :initarg :focus-hadjustment
+     :type adjustment)
+    (focus-vadjustment
+     :allocation :virtual
+     :getter "gtk_container_get_focus_vadjustment"
+     :setter "gtk_container_set_focus_vadjustment"
+     :accessor container-focus-vadjustment
+     :initarg :focus-vadjustment
+     :type adjustment)))
+      
+  ("GtkBin"
+   :slots
+   ((child
+     :allocation :virtual
+     :getter "gtk_bin_get_child"
+     :setter (setf bin-child)
+     :reader bin-child
+     :type widget)))
   
-(defclass menu-item-child (item-child))
-
+  ("GtkTooltips"
+   :slots
+   ((enabled
+     :allocation :virtual
+     :getter "gtk_tooltips_get_enabled"
+     :setter (setf tooltips-enabled-p)
+     :reader tooltips-enabled-p
+     :initarg :enabled
+     :type boolean)))
   
-(defclass check-menu-item (menu-item)
-  ((active
-    :allocation :virtual
-    :location ("gtk_check_menu_item_get_active"
-	       "gtk_check_menu_item_set_active")
-    :accessor check-menu-item-active-p
-    :initarg :active
-    :type boolean)
-   (toggle-indicator
-    :allocation :virtual
-    :location ("gtk_check_menu_item_get_show_toggle"
-	       "gtk_check_menu_item_set_show_toggle")
-    :accessor check-menu-item-toggle-indicator-p
-    :initarg :toggle-indicator
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkCheckMenuItem"))
-
-(defclass check-menu-item-child (menu-item-child))
-
-
-(defclass radio-menu-item (check-menu-item)
-  ((group
-    :allocation :virtual
-    :location "gtk_radio_menu_item_group"
-    :reader radio-menu-item-group
-    :type radio-menu-item-group))
-  (:metaclass container-class)
-  (:alien-name "GtkRadioMenuItem"))
-
-(defclass radio-menu-item-child (check-menu-item-child))
-
-
-(defclass tearoff-menu-item (menu-item)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkTearoffMenuItem"))
-
-(defclass tearoff-menu-item-child (menu-item-child))
-
-
-(defclass list-item (item)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkListItem"))
-
-(defclass list-item-child (item-child))
-  
-
-;; deprecated
-(defclass tree-item (item)
-  ()
-;   :slots
-;   ;; slots not accessible through the arg mechanism
-;   ((subtree                :write-method :lisp :type tree-item)))
-  (:metaclass container-class)
-  (:alien-name "GtkTreeItem"))
-
-(defclass tree-item-child (item-child))
-
-
-(defclass window (bin)
-  ((type
-    :allocation :arg
-    :accessor window-type
-    :initarg :type
-    :type window-type)
-   (title
-    :allocation :arg
-    :accessor window-title
-    :initarg :title
-    :type string)
-   (auto-shrink
-    :allocation :arg
-    :accessor window-auto-shrink-p
-    :initarg :auto-shrink
-    :type boolean)
-   (allow-shrink
-    :allocation :arg
-    :accessor window-allow-shrink-p
-    :initarg :allow-shrink
-    :type boolean)
-   (allow-grow
-    :allocation :arg
-    :accessor window-allow-grow-p
-    :initarg :allow-grow
-    :type boolean)
-   (modal
-    :allocation :arg
-    :accessor window-modal-p
-    :initarg :modal
-    :type boolean)
-   (position
-    :allocation :arg
-    :location "GtkWindow::window_position"
-    :accessor window-position
-    :initarg :position
-    :type window-position)
-   (default-width
-    :allocation :arg
-    :accessor window-default-width
-    :initarg :default-width
-    :type int)
-   (default-height
-    :allocation :arg
-    :accessor window-default-height
-    :initarg :default-height
-    :type int))
-  (:metaclass container-class)
-  (:alien-name "GtkWindow"))
-
-(defclass window-child (bin-child))
-
-
-; (defclass color-selection-dialog window
-;   :slots
-;   ;; slots not accessible through the arg mechanism
-;   ((colorsel               :read-only t :type widget)
-;    (main-vbox              :read-only t :type widget)
-;    (ok-button              :read-only t :type widget)
-;    (reset-button           :read-only t :type widget)
-;    (cancel-button          :read-only t :type widget)
-;    (help-button            :read-only t :type widget)))
-
-; (defclass dialog window
-;   :slots
-;   ;; slots not accessible through the arg mechanism
-;   ((action-area            :read-only t :type widget)
-;    (vbox                   :read-only t :type widget)))
-
-; (defclass input-dialog dialog)
-
-; (defclass file-selection window
-;   :slots
-;   ;; slots not accessible through the arg mechanism
-;   ((filename               :type string)
-;    (action-area            :read-only t :type widget)
-;    (ok-button              :read-only t :type widget)
-;    (cancel-button          :read-only t :type widget)))
-
-; (defclass plug window)
-
-
-(defclass event-box (bin)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkEventBox"))
-
-(defclass event-box-child (bin-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass handle-box (bin)
-  ((shadow-type
-    :allocation :arg
-    :location "GtkHandleBox::shadow"
-    :accessor handle-box-shadow-type
-    :initarg :shadow-type
-    :type shadow-type)   
-   (handle-position
-    :allocation :arg
-    :accessor handle-box-handle-position
-    :initarg :handle-position
-    :type position-type)
-   (snap-edge
-    :allocation :arg
-    :accessor handle-box-snap-edge
-    :initarg :snap-edge
-    :type position-type))
-  (:metaclass container-class)
-  (:alien-name "GtkHandleBox"))
-
-(defclass handle-box-child (bin-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass scrolled-window (bin)
-  ((hadjustment
-    :allocation :arg
-    :accessor scrolled-window-hadjustment
-    :initarg :hadjustment
-    :type adjustment)   
-   (vadjustment
-    :allocation :arg
-    :accessor scrolled-window-vadjustment
-    :initarg :vadjustment
-    :type adjustment)
-   (hscrollbar-policy
-    :allocation :arg
-    :accessor scrolled-window-hscrollbar-policy
-    :initarg :hscrollbar-policy
-    :type policy-type)
-   (vscrollbar-policy
-    :allocation :arg
-    :accessor scrolled-window-vscrollbar-policy
-    :initarg :vscrollbar-policy
-    :type policy-type)
-   (placement
-    :allocation :arg
-    :location "GtkScrolledWindow::window_placement"
-    :accessor scrolled-window-placement
-    :initarg :placement
-    :type corner-type)
-   (shadow-type
-    :allocation :arg
-    :location "GtkScrolledWindow::shadow"
-    :accessor scrolled-window-shadow-type
-    :initarg :shadow-type
-    :type shadow-type)
-   (hscrollbar
-    :allocation :virtual
-    :location "gtk_scrolled_window_get_hscrollbar"
-    :accessor scrolled-window-hscrollbar
+  ("GtkOptionMenu"
+   :slots
+   ((menu
+     :allocation :virtual
+     :getter "gtk_option_menu_get_menu"
+     :setter (setf option-menu-menu)
+     :reader option-menu-menu
+     :initarg :menu
+     :type widget)
+    (history
+     :allocation :virtual
+     :getter "gtk_option_menu_get_history"
+     :setter "gtk_option_menu_set_history"
+     :accessor option-menu-history
+     :initarg :history
+     :type unsigned-int)))
+
+  ("GtkMenuItem"
+   :slots
+   ((label
+     :allocation :virtual
+     :setter menu-item-label
+     :initarg :label
+     :type string)
+    (submenu
+     :allocation :virtual
+     :getter "gtk_menu_item_get_submenu"
+     :setter (setf menu-item-submenu)
+     :reader menu-item-submenu
+     :initarg :submenu
+     :type menu-item)
+    (placement
+     :allocation :virtual
+     :getter "gtk_menu_item_get_placement"
+     :setter "_gtk_menu_item_set_placement"  ; why underscore?
+     :accessor menu-item-placement
+     :initarg :placement
+     :type submenu-placement)
+    (submenu-indicator
+     :allocation :virtual
+     :getter "gtk_menu_item_get_show_submenu"
+     :setter "gtk_menu_item_set_show_submenu"
+     :accessor menu-item-submenu-indicator-p
+     :initarg :submenu-indicator
+     :type boolean)))
+
+  ("GtkColorSelectionDialog"
+   :slots
+   ((colorsel
+     :allocation :alien
+     :reader color-selection-dialog-colorsel
+     :type widget)
+    (ok-button
+     :allocation :alien
+     :reader color-selection-dialog-ok-button
+     :type widget)
+    (cancel-button
+     :allocation :alien
+     :reader color-selection-dialog-cancel-button
+     :type widget)
+    (help-button
+     :allocation :alien
+     :reader color-selection-dialog-help-button
+     :type widget)))
+
+  ("GtkScrolledWindow"
+   :slots
+   ((hscrollbar
+     :allocation :alien
+     :reader scrolled-window-hscrollbar
+     :type widget)
+    (vscrollbar
+     :allocation :alien
+     :reader scrolled-window-vscrollbar
+     :type widget)))
+
+  ("GtkPaned"
+   :slot
+   ((child1
+    :allocation :virtual
+    :getter paned-child1
+    :setter (setf paned-child1)
+    :initarg :child1
     :type widget)
-   (vscrollbar
+   (child2
     :allocation :virtual
-    :location "gtk_scrolled_window_get_vscrollbar"
-    :accessor scrolled-window-vscrollbar
-    :type widget))
-  (:metaclass container-class)
-  (:alien-name "GtkScrolledWindow"))
-
-(defclass scrolled-window-child (bin-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass viewport (bin)
-  ((hadjustment
-    :allocation :arg
-    :accessor viewport-hadjustment
-    :initarg :hadjustment
-    :type adjustment)   
-   (vadjustment
-    :allocation :arg
-    :accessor viewport-vadjustment
-    :initarg :vadjustment
-    :type adjustment)
-   (shadow-type
-    :allocation :arg
-    :accessor viewport-shadow-type
-    :initarg :shadow-type
-    :type shadow-type))
-  (:metaclass container-class)
-  (:alien-name "GtkViewport"))
-
-(defclass viewport-child (bin-child)
-  ()
-  (:metaclass child-class))
-  
-
-(defclass box (container)
-  ((spacing
-    :allocation :arg
-    :accessor box-spacing
-    :initarg :spacing
-    :type int)
-   (homogeneous
-    :allocation :arg
-    :accessor box-homogeneous-p
-    :initarg :homogeneous
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkBox"))
-
-(defclass box-child (container-child)
-  ((expand
-    :allocation :arg
-    :accessor box-child-expand-p
-    :initarg :expand
-    :type boolean)
-   (fill
-    :allocation :arg
-    :accessor box-child-fill-p
-    :initarg :fill
-    :type boolean)
-   (padding
-    :allocation :arg
-    :accessor box-child-padding
-    :initarg :padding
-    :type unsigned-long)
-   (pack-type
-    :allocation :arg
-    :accessor box-child-pack-type
-    :initarg :pack-type
-    :type pack-type)
-   (position
-    :allocation :arg
-    :accessor box-child-position
-    :initarg :position
-    :type long))
-  (:metaclass child-class))
-   
-
-(defclass button-box (box)
-  ((spacing
-    :allocation :virtual
-    :location ("gtk_button_box_get_spacing" "gtk_button_box_set_spacing")
-    :accessor button-box-spacing
-    :type int)
-   (layout
-    :allocation :virtual
-    :location ("gtk_button_box_get_layout" "gtk_button_box_set_layout")
-    :accessor button-box-layout
-    :type button-box-style))
-  (:metaclass container-class)
-  (:alien-name "GtkButtonBox"))
-
-(defclass button-box-child (box-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass hbutton-box (button-box)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkHButtonBox"))
-
-(defclass hbutton-box-child (button-box-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass vbutton-box (button-box)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkVButtonBox"))
-
-(defclass vbutton-box-child (button-box-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass vbox (box)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkVBox"))
-
-(defclass vbox-child (box-child)
-  ()
-  (:metaclass child-class))
-
-
-; (defclass color-selection vbox
-;   :slots
-;   ((policy                 :c-writer "gtk_color_selection_set_update_policy"
-; 			   :read-method :arg :type update-type)
-;    (use-opacity            :c-writer "gtk_color_selection_set_opacity"
-; 			   :read-method :arg :type boolean)
-;    ;; slots not accessible through the arg mechanism
-;    (color                  :access-method :lisp)))
-
-; (defclass gamma-curve vbox)
-
-
-(defclass hbox (box)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkHBox"))
-
-(defclass hbox-child (box-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass statusbar (hbox)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkStatusbar"))
-
-(defclass statusbar-child (hbox-child)
-  ()
-  (:metaclass child-class))
-
-;; CList and CTree is deprecated
-; (defclass clist container
-;   :c-name "GtkCList"
-;   :c-prefix "gtk_clist_"
-;   :slots
-;   ((n-columns              :read-only t :initarg t :access-method :arg
-; 			   :type unsigned-int)
-;    (shadow-type            :read-method :arg :type shadow-type)
-;    (selection-mode         :read-method :arg :type selection-mode)
-;    (row-height             :read-method :arg :type unsigned-int)
-;    (reorderable            :read-method :arg :type boolean)
-;    (titles-visible         :write-method :lisp :type boolean)
-;    (titles-active          :access-method :arg :type boolean)
-;    (use-drag-icons         :read-method :arg :type boolean)
-;    (sort-type              :read-method :arg :type sort-type)
-;    ;; slots not accessible through the arg mechanism
-;    (hadjustment            :type adjustment)
-;    (vadjustment            :type adjustment)
-;    (sort-column            :type int)
-;    (focus-row              :reader %clist-focus-row :read-only t :type int)
-;    (n-rows                 :read-only t :type int)))
-
-; (defclass ctree clist
-;   :c-name "GtkCTree"
-;   :c-prefix "gtk_ctree_"
-;   :slots
-;   ((n-columns              :read-only t :initarg t :access-method :arg
-; 			   :type unsigned-int)
-;    (tree-column            :read-only t :initarg t :access-method :arg
-; 			   :type unsigned-int)
-;    (indent                 :read-method :arg :type unsigned-int)
-;    (spacing                :read-method :arg :type unsigned-int)
-;    (show-stub              :read-method :arg :type boolean)
-;    (line-style             :read-method :arg :type ctree-line-style)
-;    (expander-style         :read-method :arg :type ctree-expander-style)))
-
-(defclass fixed (container)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkFixed"))
-
-(defclass fixed-child (container-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass notebook (container)
-  ((tab-pos
-    :allocation :arg
-    :accessor notebook-tab-pos
-    :initarg :tab-pos
-    :type position-type)
-   (show-tabs
-    :allocation :arg
-    :accessor notebook-show-tabs-p
-    :initarg :show-tabs
-    :type boolean)
-   (show-border
-    :allocation :arg
-    :accessor notebook-show-border-p
-    :initarg :show-border
-    :type boolean)
-   (scrollable
-    :allocation :arg
-    :accessor notebook-scrollable-p
-    :initarg :scrollable
-    :type boolean)
-   (tab-border
-    :allocation :arg
-    :accessor notebook-tab-border
-    :initarg :tab-border
-    :type unsigned-int)
-   (tab-hborder
-    :allocation :arg
-    :accessor notebook-tab-hborder
-    :initarg :tab-hborder
-    :type unsigned-int)
-   (tab-vborder
-    :allocation :arg
-    :accessor notebook-tab-vborder
-    :initarg :tab-vborder
-    :type unsigned-int)
-   (page
-    :allocation :arg
-    :accessor notebook-page
-    :initarg :page
-    :type int)
-   (enable-popup
-    :allocation :arg
-    :accessor notebook-enable-popup-p
-    :initarg :enable-popup
-    :type boolean)
-   (homogeneous
-    :allocation :arg
-    :accessor notebook-homogeneous-p
-    :initarg :homogeneous
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkNotebook"))
-
-(defclass notebook-child (container-child)
-  ((tab-label
-    :allocation :arg
-    :accessor notebook-child-tab-label
-    :initarg :tab-label
-    :type string)
-   (menu-label
-    :allocation :arg
-    :accessor notebook-child-menu-label
-    :initarg :menu-label
-    :type string)
-   (position
-    :allocation :arg
-    :accessor notebook-child-position
-    :initarg :position
-    :type int)
-   (tab-fill
-    :allocation :arg
-    :accessor notebook-child-tab-fill-p
-    :initarg :tab-fill
-    :type boolean)
-   (tab-pack
-    :allocation :arg
-    :accessor notebook-child-tab-pack-p
-    :initarg :tab-pack
-    :type boolean))
-  (:metaclass child-class))
-
-
-(defclass font-selection (notebook)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkFontSelection"))
-
-(defclass font-selection-child (notebook-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass paned (container)
-  ((handle-size
-    :allocation :arg
-    :accessor paned-handle-size
-    :initarg handle-size
-    :type unsigned-int)
-   (position
-    :allocation :virtual
-    :location ("gtk_paned_get_position" "gtk_paned_set_position")
-    :accessor paned-position
-    :initarg :position
-    :type int))
-  (:metaclass container-class)
-  (:alien-name "GtkPaned"))
-
-(defclass paned-child (container-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass hpaned (paned)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkHPaned"))
-
-(defclass hpaned-child (paned-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass vpaned (paned)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkVPaned"))
-
-(defclass vpaned-child (paned-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass layout (container)
-  ((hadjustment
-    :allocation :virtual
-    :location ("gtk_layout_get_hadjustment" "gtk_layout_set_hadjustment")
-    :accessor layout-hadjustment
-    :initarg :hadjustment
-    :type adjustment)
-   (vadjustment
-    :allocation :virtual
-    :location ("gtk_layout_get_vadjustment" "gtk_layout_set_vadjustment")
-    :accessor layout-vadjustment
-    :initarg :vadjustment
-    :type adjustment))
-  (:metaclass container-class)
-  (:alien-name "GtkLayout"))
-
-(defclass layout-child (container-child)
-  ()
-  (:metaclass child-class))
-  
-
-; (defclass list-widget container
-;   :c-name "GtkList"
-;   :slots
-;   ((selection-mode         :read-method :arg :accessor list-selection-mode
-; 			   :c-writer "gtk_list_set_selection_mode"
-; 			   :type selection-mode)))
-
-
-(defclass menu-shell (container)
-  ()
-  (:metaclass container-class)
-  (:alien-name "GtkMenuShell"))
-
-(defclass menu-shell-child (container-child)
-  ()
-  (:metaclass child-class))
-
-
-(defclass menu-bar (menu-shell)
-  ((shadow-type
-    :allocation :arg
-    :location "GtkMenuBar::shadow"
-    :accessor menu-bar-shadow-type
-    :initarg :shadow-type
-    :type shadow-type))
-  (:metaclass container-class)
-  (:alien-name "GtkMenuBar"))
-
-(defclass menu-bar-child (menu-shell-child)
-  ()
-  (:metaclass child-class))
-  
-
-(defclass menu (menu-shell)
-  ((accel-group
-    :allocation :virtual
-    :location ("gtk_menu_get_accel_group" "gtk_menu_set_accel_group")
-    :accessor menu-accel-group
-    :initarg :accel-group
-    :type accel-group)
-   (tornoff
-    :allocation :virtual
-    :location ("gtk_menu_get_tearoff_state" "gtk_menu_set_tearoff_state")
-    :accessor menu-tornoff-p
-    :initarg :tearoff
-    :type boolean)
-   (title
-    :allocation :virtual
-    :location ("gtk_menu_get_title" "gtk_menu_set_title")
-    :accessor menu-title
-    :initarg :title
-    :type string))
-  (:metaclass container-class)
-  (:alien-name "GtkMenu"))
-
-(defclass menu-child (menu-shell-child)
-  ()
-  (:metaclass child-class))
-  
-
-(defclass packer (container)
-  ((spacing
-    :allocation :arg
-    :accessor packer-spacing
-    :initarg :spacing
-    :type unsigned-int)
-   (default-border-width
-    :allocation :arg
-    :accessor packer-default-border-width
-    :initarg :default-border-width
-    :type unsigned-int)
-   (default-pad-x
-    :allocation :arg
-    :accessor packer-default-pad-x
-    :initarg :default-pad-x
-    :type unsigned-int)
-   (default-pad-y
-    :allocation :arg
-    :accessor packer-default-pad-y
-    :initarg :default-pad-y
-    :type unsigned-int)
-   (default-ipad-x
-    :allocation :arg
-    :accessor packer-default-ipad-y
-    :initarg :default-ipad-y
-    :type unsigned-int)
-   (default-ipad-y
-    :allocation :arg
-    :accessor packer-default-ipad-y
-    :initarg :default-ipad-y
-    :type unsigned-int))
-  (:metaclass container-class)
-  (:alien-name "GtkPacker"))
-
-(defclass packer-child (container-child)
-  ((side
-    :allocation :arg
-    :accessor packer-child-side
-    :initarg :side
-    :type side-type)
-   (anchor
-    :allocation :arg
-    :accessor packer-child-anchor
-    :initarg :anchor
-    :type anchor-type)
-   (expand
-    :allocation :arg
-    :accessor packer-child-expand-p
-    :initarg :expand
-    :type boolean)
-   (fill-x
-    :allocation :arg
-    :accessor packer-child-fill-x-p
-    :initarg :fill-x
-    :type boolean)
-   (fill-y
-    :allocation :arg
-    :accessor packer-child-fill-y-p
-    :initarg :fill-y    
-    :type boolean)
-   (use-default
-    :allocation :arg
-    :accessor packer-child-use-default
-    :initarg :default
-    :type boolean)
-   (border-width
-    :allocation :arg
-    :accessor packer-child-border-width
-    :initarg :default    
-    :type unsigned-int)
-   (pad-x
-    :allocation :arg
-    :accessor packer-child-pad-x
-    :initarg :pad-x
-    :type unsigned-int)
-   (pad-y
-    :allocation :arg
-    :accessor packer-child-pad-y
-    :initarg :pad-y
-    :type unsigned-int)
-   (ipad-x
-    :allocation :arg
-    :accessor packer-child-ipad-x
-    :initarg :ipad-x
-    :type unsigned-int)
-   (ipad-y
-    :allocation :arg
-    :accessor packer-child-ipad-y
-    :initarg :ipad-y
-    :type unsigned-int)
-   (position
-    :allocation :arg
-    :accessor packer-child-position
-    :initarg :iposition
-    :type long))
-  (:metaclass child-class))
-
-
-;(defclass socket (container))
-
-
-(defclass table (container)
-  ((rows
-    :allocation :arg
-    :location "GtkTable::n_rows"
-    :accessor table-rows
-    :initarg :rows
-    :type unsigned-int)
-   (columns
-    :allocation :arg
-    :location "GtkTable::n_columns"
-    :accessor table-columns
-    :initarg :columns
-    :type unsigned-int)
-   (row-spacing
-    :allocation :arg
-    :accessor table-row-spacing
-    :initarg :row-spacing
-    :type unsigned-int)
-   (column-spacing
-    :allocation :arg
-    :accessor table-column-spacing
-    :initarg :column-spacing
-    :type unsigned-int)
-   (homogeneous
-    :allocation :arg
-    :accessor table-homogeneous-p
-    :initarg :homogeneous
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkTable"))
-
-(defclass table-child (container-child)
-  ((left-attach
-    :allocation :arg
-    :accessor table-child-left-attach
-    :initarg :left-attach
-    :type unsigned-int)
-   (right-attach
-    :allocation :arg
-    :accessor table-child-right-attach
-    :initarg :right-attach
-    :type unsigned-int)
-   (top-attach
-    :allocation :arg
-    :accessor table-child-top-attach
-    :initarg :top-attach
-    :type unsigned-int)
-   (bottom-attach
-    :allocation :arg
-    :accessor table-child-bottom-attach
-    :initarg :bottom-attach
-    :type unsigned-int)
-   (x-options
-    :allocation :arg
-    :accessor table-child-x-options
-    :initarg :x-options
-    :type attach-options)
-   (y-options
-    :allocation :arg
-    :accessor table-child-y-options
-    :initarg :y-options
-    :type attach-options)
-   (x-padding
-    :allocation :arg
-    :accessor table-child-x-padding
-    :initarg :x-padding
-    :type unsigned-int)
-   (y-padding
-    :allocation :arg
-    :accessor table-child-y-padding
-    :initarg :y-padding
-    :type unsigned-int)
-   
-   (x-expand
-    :allocation :virtual
-    :location table-child-x-expand-p
-    :initarg :x-expand
-    :type boolean)   
-   (y-expand
-    :allocation :virtual
-    :location table-child-y-expand-p
-    :initarg :y-expand
-    :type boolean)
-   (x-shrink
-    :allocation :virtual
-    :location table-child-x-shrink-p
-    :initarg :x-shrink
-    :type boolean)   
-   (y-shrink
-    :allocation :virtual
-    :location table-child-y-shrink-p
-    :initarg :y-shrink
-    :type boolean)   
-   (x-fill
-    :allocation :virtual
-    :location table-child-x-fill-p
-    :initarg :x-fill
-    :type boolean)   
-   (y-fill
-    :allocation :virtual
-    :location table-child-y-fill-p
-    :initarg :y-fill
-    :type boolean))
-  (:metaclass child-class))
-  
-
-(defclass toolbar (container)
-  ((orientation
-    :allocation :arg
-    :accessor toolbar-orientation
-    :initarg :orientation
-    :type orientation)
-   (toolbar-style
-    :allocation :arg
-    :accessor toolbar-style
-    :initarg :toolbar-style
-    :type toolbar-style)
-   (space-size
-    :allocation :arg
-    :accessor toolbar-space-size
-    :initarg :space-size
-    :type unsigned-int)
-   (space-style
-    :allocation :arg
-    :accessor toolbar-space-style
-    :initarg :space-style
-    :type toolbar-space-style)
-   (relief
-    :allocation :arg
-    :accessor toolbar-relief
-    :initarg :relief
-    :type relief-style)
-   (tooltips
-    :allocation :virtual
-    :location ("gtk_toolbar_get_tooltips" "gtk_toolbar_set_tooltips")
-    :accessor toolbar-tooltips-p
-    :initarg :tooltips
-    :type boolean))
-  (:metaclass container-class)
-  (:alien-name "GtkToolbar"))
-
-(defclass toolbar-child (container-child)
-  ()
-  (:metaclass child-class))
-
-
-;; Deprecated
-(defclass tree (container)
-  ()
-;   :slots
-;   ;; slots not accessible through the arg mechanism
-;   ((selection-mode         :type selection-mode)
-;    (view-mode              :type tree-view-mode)
-;    (view-lines             :type boolean)
-;    (root-tree              :read-only t :type tree)))
-  (:metaclass container-class)
-  (:alien-name "GtkTree"))
-
-
-(defclass calendar (widget)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkCalendar"))
-
-
-(defclass drawing-area (widget)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkDrawingArea"))
-
-; (defclass curve drawing-area
-;   :slots
-;   ((curve-type             :read-method :arg :type curve-type)
-;    (min-x                  :access-method :arg :type single-float)
-;    (max-x                  :access-method :arg :type single-float)
-;    (min-y                  :access-method :arg :type single-float)
-;    (max-y                  :access-method :arg :type single-float)))
-
-(defclass editable (widget)
-  ((position
-    :allocation :arg
-    :location "GtkEditable::text_position"
-    :accessor ediatable-position
-    :initarg :position
-    :type int)
-   (editable
-    :allocation :arg
-    :accessor ediatable-editable-p
-    :initarg :editabe
-    :type boolean)
-   (text
-    :allocation :virtual
-    :location editable-text
-    :initarg text
-    :type string))
-  (:metaclass widget-class)
-  (:alien-name "GtkEditable"))
-
-  
-(defclass entry (editable)
-  ((max-length
-    :allocation :arg
-    :accessor entry-max-length
-    :initarg :max-length
-    :type unsigned-int)
-   (visible
-    :allocation :arg
-    :location "GtkEntry::visibility"
-    :accessor entry-visible-p
-    :initarg :visible
-    :type boolean))
-  (:metaclass widget-class)
-  (:alien-name "GtkEntry"))
-  
+    :getter paned-child2
+    :setter (setf paned-child2)
+    :initarg :child2
+    :type widget)))
 
-(defclass combo (hbox)
-  ((entry
-    :allocation :virtual
-    :location "gtk_combo_get_entry"
-    :reader combo-entry
-    :type entry)
-   (use-arrows
-    :allocation :virtual
-    :location ("gtk_combo_get_use_arrows" "gtk_combo_set_use_arrows")
-    :accessor combo-use-arrows-p
-    :initarg :use-arrows
-    :type boolean)
-   (use-arrows-always
-    :allocation :virtual
-    :location
-    ("gtk_combo_get_use_arrows_always" "gtk_combo_set_use_arrows_always")
-    :accessor combo-use-arrows-always-p
-    :initarg :use-arrows-always
-    :type boolean)
-   (case-sensitive
-    :allocation :virtual
-    :location ("gtk_combo_get_case_sensitive" "gtk_combo_set_case_sensitive")
-    :accessor combo-case-sensitive-p
-    :initarg :case-sensitive
-    :type boolean))
-  (:metaclass widget-class)
-  (:alien-name "GtkCombo"))
-  
+  ("GtkMenu"
+   :slots
+   ((accel-group
+     :allocation :virtual
+     :getter "gtk_menu_get_accel_group"
+     :setter "gtk_menu_set_accel_group"
+     :accessor menu-accel-group
+     :initarg :accel-group
+     :type accel-group)
+    (active
+     :allocation :virtual
+     :getter "gtk_menu_get_active"
+     :setter (setf menu-active)
+     :reader menu-active
+     :initarg :active
+     :type widget)
+    (tornoff
+     :allocation :virtual
+     :getter "gtk_menu_get_tearoff_state"
+     :setter "gtk_menu_set_tearoff_state"
+     :accessor menu-tornoff-p
+     :initarg :tearoff
+     :type boolean)))
+
+  ("GtkToolbar"
+   :slots
+   ((tooltips
+     :allocation :virtual
+     :getter "gtk_toolbar_get_tooltips"
+     :setter "gtk_toolbar_set_tooltips"
+     :accessor toolbar-tooltips-p
+     :initarg :tooltips
+     :type boolean)
+    (icon-size
+     :allocation :virtual
+     :getter "gtk_toolbar_get_icon_size"
+     :setter "gtk_toolbar_set_icon_size"
+     :accessor toolbar-icon-size
+     :initarg :icon-size
+     :type icon-size)))
+
+  ("GtkRuler"
+   :slots
+   ((metric
+     :allocation :virtual
+     :getter "gtk_ruler_get_metric"
+     :setter "gtk_ruler_set_metric"
+     :accessor ruler-metric
+     :initarg :metric
+     :type metric-type)))
+
+  ("GtkProgressBar"
+   :slots
+   ; deprecated properties
+   ((bar-style :ignore t)
+    (adjustment :ignore t)
+    (activity-step :ignore t)
+    (activity-blocks :ignore t)
+    (discrete-blocks :ignore t)))
+
+  ("GtkTable"
+   :slots
+   ((column-spacing
+     :allocation :virtual
+     :getter "gtk_table_get_default_col_spacing"
+     :setter "gtk_table_set_col_spacings"
+     :initarg :column-spacing
+     :type unsigned-int)
+    (row-spacing
+     :allocation :virtual
+     :getter "gtk_table_get_default_row_spacing"
+     :setter "gtk_table_set_row_spacings"
+     :initarg :row-spacing
+     :type unsigned-int)))
+
+  ("GtkDialog"
+   :slots
+   ((vbox
+     :allocation :virtual
+     :getter "gtk_dialog_get_vbox"
+     :reader dialog-vbox
+     :type widget)
+    (action-area
+     :allocation :virtual
+     :getter "gtk_dialog_get_action_area"
+     :reader dialog-action-area
+     :type widget)))
+
+  ("GtkCombo"
+   :slots
+   ((entry
+     :allocation :virtual
+     :getter "gtk_combo_get_entry"
+     :reader combo-entry
+     :type entry)))
+
+  ("GtkRadioButton"
+   :slots
+   ((group
+     :allocation :virtual
+     :getter "gtk_radio_button_get_group"
+     :reader radio-button-group
+     :type (static (gslist widget)))))
+
+  ("GtkRadioMenuItem"
+   :slots
+   ((group
+     :allocation :virtual
+     :getter "gtk_radio_menu_item_get_group"
+     :reader radio-menu-item-group
+     :type (static (gslist widget)))))
+
+  ("GtkFileSelection"
+   :slots
+   ((action-area
+     :allocation :virtual
+     :getter "gtk_file_selection_get_action_area"
+     :reader file-selection-action-area
+     :type widget)
+    (ok-button
+     :allocation :virtual
+     :getter "gtk_file_selection_get_ok_button"
+     :reader file-selection-ok-button
+     :type widget)
+    (cancel-button
+     :allocation :virtual
+     :getter "gtk_file_selection_get_cancel_button"
+     :reader file-selection-cancel-button
+     :type widget)))
+
+  ("GtkLayout"
+   :slots
+   ((bin-window
+     :getter "gtk_layout_get_bin_window"
+     :reader layout-bin-window
+     :type gdk:window)))
+     
+  ;; Not needed
+  ("GtkFundamentalType" :ignore t)
+  ("GtkArgFlags" :ignore t)
 
-(defclass spin-button (entry)
-  ((adjustment
-    :allocation :arg
-    :accessor spin-button-adjustment
-    :initarg :adjustment
-    :type adjustment)
-   (climb-rate
-    :allocation :arg
-    :accessor spin-button-climb-rate
-    :initarg :climb-rate
-    :type single-float)
-   (digits
-    :allocation :arg
-    :accessor spin-button-digits
-    :initarg :digits
-    :type unsigned-int)
-   (snap-to-ticks
-    :allocation :arg
-    :accessor spin-button-snap-to-ticks-p
-    :initarg :snap-to-ticks
-    :type boolean)
-   (numeric
-    :allocation :arg
-    :accessor spin-button-numeric-p
-    :initarg :numeric
-    :type boolean)
-   (wrap
-    :allocation :arg
-    :accessor spin-button-wrap-p
-    :initarg :wrap
-    :type boolean)
-   (update-policy
-    :allocation :arg
-    :accessor spin-button-update-policy
-    :initarg :update-policy
-    :type spin-button-update-policy)
-   (shadow-type
-    :allocation :arg
-    :accessor spin-button-shadow-type
-    :initarg :shadow-type
-    :type shadow-type)
-   (value
-    :allocation :arg
-    :accessor spin-button-value
-    :initarg :value
-    :type single-float))
-  (:metaclass widget-class)
-  (:alien-name "GtkSpinButton"))
   
-
-;; Deprecated
-; (defclass text editable
-;   :slots
-;   ((hadjustment            :access-method :arg :type adjustment)
-;    (vadjustment            :access-method :arg :type adjustment)
-;    (line-wrap              :read-method :arg :type boolean)
-;    (word-wrap              :read-method :arg :type boolean)
-;    ;; slots not accessible through the arg mechanism
-;    (point                  :type unsigned-int)
-;    (length                 :read-only t :type unsigned-int)))
-
-(defclass ruler (widget)
-  ((lower
-    :allocation :arg
-    :accessor ruler-lower
-    :initarg :lower
-    :type single-float)
-   (upper
-    :allocation :arg
-    :accessor ruler-upper
-    :initarg :upper
-    :type single-float)
-   (position
-    :allocation :arg
-    :accessor ruler-position
-    :initarg :position
-    :type single-float)
-   (max-size
-    :allocation :arg
-    :accessor ruler-max-size
-    :initarg :max-size
-    :type single-float)
-   (metric
-    :allocation :virtual
-    :location (nil "gtk_ruler_set_metric")
-    :accessor ruler-metric
-    :initarg :metric
-    :type metric-type))
-  (:metaclass widget-class)
-  (:alien-name "GtkRuler"))
-
-
-(defclass hruler (ruler)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkHRuler"))
-
-
-(defclass vruler (ruler)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkVRuler"))
-
-
-(defclass range (widget)
-  ((update-policy
-    :allocation :arg
-    :accessor range-update-policy
-    :initarg :update-policy
-    :type update-type)
-   (adjustment
-    :allocation :virtual
-    :location ("gtk_range_get_adjustment" "gtk_range_set_adjustment")
-    :accessor ruler-adjustment
-    :initarg :adjustment
-    :type adjustment))
-  (:metaclass widget-class)
-  (:alien-name "GtkRange"))
-
-
-(defclass scale (range)
-  ((digits
-    :allocation :arg
-    :accessor scale-digits
-    :initarg :digits
-    :type unsigned-int)
-   (draw-value
-    :allocation :arg
-    :accessor scale-draw-value-p
-    :initarg :draw-value
-    :type boolean)
-   (value-position
-    :allocation :arg
-    :location "GtkScale::value_pos"
-    :accessor scale-value-position
-    :initarg :value-position
-    :type position-type)
-   (value-width
-    :allocation :virtual
-    :location "gtk_scale_get_value_width"
-    :reader ruler-value-width
-    :type int))
-  (:metaclass widget-class)
-  (:alien-name "GtkScale"))
-
-
-(defclass hscale (scale)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkHScale"))
-
-
-(defclass vscale (scale)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkVScale"))
-
-
-(defclass scrollbar (range)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkScrollbar"))
-
-
-(defclass hscrollbar (scrollbar)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkHScrollbar"))
-
-
-(defclass vscrollbar (scrollbar)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkVScrollbar"))
-
-
-(defclass separator (widget)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkSeparator"))
-
-
-(defclass hseparator (separator)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkHSeparator"))
-
-
-(defclass vseparator (separator)
-  ()
-  (:metaclass widget-class)
-  (:alien-name "GtkVSeparator"))
-
-
-; (defclass preview widget
-;   :slots
-;   ((expand                 :read-method :arg :type boolean)))
-
-; (defclass progress widget
-;   :slots
-;   ((activity-mode          :read-method :arg :type boolean)
-;    (show-text              :read-method :arg :type boolean)
-;    (text-xalign            :access-method :arg :type single-float)
-;    (text-yalign            :access-method :arg :type single-float)
-;    ;; slots not accessible through the arg mechanism
-;    (format-string          :type string)
-;    (adjustment             :type adjustment)
-;    (percentage             :c-reader "gtk_progress_get_current_percentage"
-; 			   :type single-float)
-;    (value                  :type single-float)
-;    (text                   :c-reader "gtk_progress_get_current_text"
-; 			   :read-only t :type string)))
-
-; (defclass progress-bar progress
-;   :slots
-;   ((adjustment             :c-writer "gtk_progress_set_adjustment"
-; 			   :read-method :arg :type adjustment)
-;    (orientation            :read-method :arg :type progress-bar-orientation)
-;    (bar-style              :read-method :arg :accessor progress-bar-style
-; 			   :type progress-bar-style)
-;    (activity-step          :read-method :arg :type unsigned-int)
-;    (activity-blocks        :read-method :arg :type unsigned-int)
-;    (discrete-blocks        :read-method :arg :type unsigned-int)))
-
-; (defclass item-factory object)
-
+  ;; Deprecated widgets
+  ("GtkCList" :ignore-prefix t)
+  ("GtkCTree" :ignore-prefix t)
+  ("GtkList" :ignore-prefix t)
+  ("GtkTree" :ignore t)
+  ("GtkTreeItem" :ignore t)
+  ("GtkText" :ignore-prefix t)
+  ("GtkPacker" :ignore-prefix t)
+  ("GtkPixmap" :ignore t)
+  ("GtkPreview" :ignore-prefix t)
+  ("GtkTipsQuery" :ignore t)
+  ("GtkOldEditable" :ignore t))