X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/d76e9fca7e252fb02a17d64d3e1c3025de3a2670..9176d3016a7e5a30d32cbbb68ba4cfbac6ef4394:/gtk/gtk.lisp

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index f470588..05f6c8a 100644
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtk.lisp,v 1.28 2004-12-29 21:17:36 espen Exp $
+;; $Id: gtk.lisp,v 1.52 2006-02-09 22:32:47 espen Exp $
 
 
 (in-package "GTK")
@@ -39,12 +44,13 @@ (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 () (copy-of pango:language))
+(defun clg-version ()
+  "clg 0.91 version")
 
 
 ;;;; Initalization
 
-(defbinding (gtk-init "gtk_parse_args") () nil
+(defbinding (gtk-init "gtk_parse_args") () boolean
   "Initializes the library without opening the display."
   (nil null)
   (nil null))
@@ -53,27 +59,265 @@ (defun clg-init (&optional display)
   "Initializes the system and starts the event handling"
   (unless (gdk:display-get-default)
     (gdk:gdk-init)
-    (gtk-init)
+    (unless (gtk-init)
+      (error "Initialization of GTK+ failed."))
     (prog1
 	(gdk:display-open display)
-      (system:add-fd-handler 
-       (gdk:display-connection-number) :input #'main-iterate-all)
-      (setq lisp::*periodic-polling-function* #'main-iterate-all)
-      (setq lisp::*max-event-to-sec* 0)
-      (setq lisp::*max-event-to-usec* 1000))))
+      (add-fd-handler (gdk:display-connection-number) :input #'main-iterate-all)
+      (setq *periodic-polling-function* #'main-iterate-all)
+      (setq *max-event-to-sec* 0)
+      (setq *max-event-to-usec* 1000))))
+
+
+;;; Misc
+
+(defbinding grab-add () nil
+  (widget widget))
+
+(defbinding grab-get-current () widget)
+
+(defbinding grab-remove () nil
+  (widget widget))
+
+(defbinding get-default-language () (copy-of pango:language))
+
+
+;;; About dialog
+
+#+gtk2.6
+(progn
+  (def-callback-marshal %about-dialog-activate-link-func 
+    (nil (dialog about-dialog) (link (copy-of string))))
+
+  (defbinding about-dialog-set-email-hook (function) nil
+    ((callback %about-dialog-activate-link-func) pointer)
+    ((register-callback-function function) unsigned-int)
+    ((callback user-data-destroy-func) pointer))
+  
+  (defbinding about-dialog-set-url-hook (function) nil
+    ((callback %about-dialog-activate-link-func) pointer)
+    ((register-callback-function function) unsigned-int)
+    ((callback user-data-destroy-func) pointer)))
 
 
 ;;; Acccel group
 
+(defbinding %accel-group-connect () nil
+  (accel-group accel-group)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type)
+  (flags accel-flags)
+  (gclosure gclosure))
+
+(defun accel-group-connect (group accelerator function &optional flags)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (let ((gclosure (make-callback-closure function)))
+      (%accel-group-connect group key modifiers flags gclosure)
+      gclosure)))
+
+(defbinding accel-group-connect-by-path (group path function) nil
+  (group accel-group)
+  (path string)
+  ((make-callback-closure function) gclosure :return))
+
+(defbinding %accel-group-disconnect (group gclosure) boolean
+  (group accel-group)
+  (gclosure gclosure))
+
+(defbinding %accel-group-disconnect-key () boolean
+  (group accel-group)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defun accel-group-disconnect (group accelerator)
+  (etypecase accelerator
+    (gclosure (%accel-group-disconnect group accelerator))
+    (string 
+     (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+       (%accel-group-disconnect-key group key modifiers)))))
+
+(defbinding %accel-group-query () (copy-of (vector (inlined accel-group-entry) n))
+  (accel-group accel-group)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type)
+  (n int :out))
+
+(defun accel-group-query (accel-group accelerator)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (%accel-group-query accel-group key modifiers)))
+
+(defbinding %accel-group-activate () boolean
+  (accel-group accel-group)
+  (acceleratable gobject)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defun accel-group-activate (accel-group acceleratable accelerator)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (%accel-group-activate accel-group acceleratable key modifiers)))
+
+(defbinding accel-group-lock () nil
+  (accel-group accel-group))
+
+(defbinding accel-group-unlock () nil
+  (accel-group accel-group))
+
+(defbinding accel-group-from-accel-closure () accel-group
+  (closure gclosure))
+
+(defbinding %accel-groups-activate () boolean
+  (object gobject)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defun accel-groups-activate (object accelerator)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (%accel-groups-activate object key modifiers)))
+
+(defbinding accel-groups-from-object () (gslist accel-groups)
+  (object gobject))
+
+(defbinding accelerator-valid-p (key &optional modifiers) boolean
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defbinding %accelerator-parse () nil
+  (accelerator string)
+  (key unsigned-int :out)
+  (modifiers gdk:modifier-type :out))
+
+(defgeneric parse-accelerator (accelerator))
+
+(defmethod parse-accelerator ((accelerator string))
+  (multiple-value-bind (key modifiers) (%accelerator-parse accelerator)
+    (if (zerop key)
+	(error "Invalid accelerator: ~A" accelerator)
+      (values key modifiers))))
+
+(defmethod parse-accelerator ((accelerator cons))
+  (destructuring-bind (key modifiers) accelerator
+    (values
+     (etypecase key
+       (integer key)
+       (string
+	(or 
+	 (gdk:keyval-from-name key)
+	 (error "Invalid key name: ~A" key)))
+       (character (parse-accelerator key)))
+     modifiers)))
+
+(defmethod parse-accelerator ((key integer))
+  key)
+
+(defmethod parse-accelerator ((key character))
+  (or
+   (gdk:keyval-from-name (string key))
+   (error "Invalid key name: ~A" key)))
+
+
+(defbinding accelerator-name () string
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+#+gtk2.6
+(defbinding accelerator-get-label () string
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defbinding %accelerator-set-default-mod-mask () nil
+  (default-modifiers gdk:modifier-type))
+
+(defun (setf accelerator-default-modifier-mask) (default-modifiers)
+  (%accelerator-set-default-mod-mask default-modifiers))
+
+(defbinding (accelerator-default-modifier-mask "gtk_accelerator_get_default_mod_mask") () gdk:modifier-type)
 
 
 ;;; Acccel label
 
+(defbinding accel-label-get-accel-width () unsigned-int
+  (accel-label accel-label))
+
 (defbinding accel-label-refetch () boolean
   (accel-label accel-label))
 
 
-;;; Accessible
+
+;;; Accel map
+
+(defbinding (accel-map-init "_gtk_accel_map_init") () nil)
+
+(defbinding %accel-map-add-entry () nil
+  (path string)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type))
+
+(defun accel-map-add-entry (path accelerator)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (%accel-map-add-entry path key modifiers)))
+
+(defbinding %accel-map-lookup-entry () boolean
+  (path string)
+  ((make-instance 'accel-key) accel-key :return))
+
+(defun accel-map-lookup-entry (path)
+  (multiple-value-bind (found-p accel-key) (%accel-map-lookup-entry path)
+    (when found-p
+      (values 
+       (slot-value accel-key 'key)
+       (slot-value accel-key 'modifiers)
+       (slot-value accel-key 'flags)))))
+
+(defbinding %accel-map-change-entry () boolean
+  (path string)
+  (key unsigned-int)
+  (modifiers gdk:modifier-type)
+  (replace boolean))
+
+(defun accel-map-change-entry (path accelerator &optional replace)
+  (multiple-value-bind (key modifiers) (parse-accelerator accelerator)
+    (%accel-map-change-entry path key modifiers replace)))
+
+(defbinding accel-map-load () nil
+  (filename pathname))
+
+(defbinding accel-map-save () nil
+  (filename pathname))
+
+(defcallback %accel-map-foreach-func 
+    (nil
+     (callback-id unsigned-int) (accel-path (copy-of string)) 
+     (key unsigned-int) (modifiers gdk:modifier-type) (changed boolean))
+  (invoke-callback callback-id nil accel-path key modifiers changed))
+
+(defbinding %accel-map-foreach (callback-id) nil
+  (callback-id unsigned-int)
+  (%accel-map-foreach-func callback))
+
+(defbinding %accel-map-foreach-unfiltered (callback-id) nil
+  (callback-id unsigned-int)
+  (%accel-map-foreach-func callback))
+
+(defun accel-map-foreach (function &optional (filter-p t))
+  (with-callback-function (id function)
+    (if filter-p			  
+	(%accel-map-foreach id)
+      (%accel-map-foreach-unfiltered id))))
+
+(defbinding accel-map-add-filter () nil
+  (filter string))
+
+(defbinding accel-map-get () accel-map)
+
+(defbinding accel-map-lock-path () nil
+  (path string))
+
+(defbinding accel-map-unlock-path () nil
+  (path string))
+
+
+
+;;; Accessibility
 
 (defbinding accessible-connect-widget-destroyed () nil
   (accessible accessible))
@@ -102,6 +346,30 @@ (defbinding adjustment-clamp-page () nil
   (upper single-float))
 
 
+;;; Alignment
+
+(defbinding alignment-set () nil
+  (alognment alignment)
+  (x-align single-float)
+  (y-align single-float)
+  (x-scale single-float)
+  (y-scale single-float))
+
+(defbinding alignment-get-padding () nil
+  (alognment alignment)
+  (top unsigned-int :out)
+  (bottom unsigned-int :out)
+  (left unsigned-int :out)
+  (right unsigned-int :out))
+
+(defbinding alignment-set-padding () nil
+  (alognment alignment)
+  (top unsigned-int)
+  (bottom unsigned-int)
+  (left unsigned-int)
+  (right unsigned-int))
+
+
 ;;; Aspect frame
 
 
@@ -113,9 +381,12 @@ (defun (setf bin-child) (child bin)
   (container-add bin child)
   child)
 
-
-;;; Binding
-
+(defmethod compute-signal-function ((bin bin) signal function object)
+  (declare (ignore signal))
+  (if (eq object :child)
+      #'(lambda (&rest args) 
+	  (apply function (bin-child bin) (rest args)))
+    (call-next-method)))
 
 
 ;;; Box
@@ -228,10 +499,6 @@ (defbinding check-menu-item-toggled () nil
   (check-menu-item check-menu-item))
 
 
-
-;;; Clipboard
-
-
 ;;; Color selection
 
 (defbinding (color-selection-is-adjusting-p
@@ -314,113 +581,114 @@ (defmethod shared-initialize ((dialog dialog) names &rest initargs
     (initial-apply-add dialog #'dialog-add-button initargs :button :buttons)))
   
 
-(defun %dialog-find-response-id-num (dialog id &optional create-p error-p)
-  (or
-   (cadr (assoc id (rest (type-expand-1 'response-type))))
-   (let ((response-ids (object-data dialog 'response-id-key)))
-    (cond
-      ((and response-ids (position id response-ids :test #'equal)))
-      (create-p
+(defun dialog-response-id (dialog response &optional create-p error-p)
+  "Returns a numeric response id"
+  (if (typep response 'response-type)
+      (response-type-to-int response)
+    (let ((responses (object-data dialog 'responses)))
+      (cond
+       ((and responses (position response responses :test #'equal)))
+       (create-p
        (cond
-	 (response-ids
-	  (vector-push-extend id response-ids)
-	  (1- (length response-ids)))
+	 (responses
+	  (vector-push-extend response responses)
+	  (1- (length responses)))
 	 (t
 	  (setf 
-	   (object-data dialog 'response-id-key)
-	   (make-array 1 :adjustable t :fill-pointer t :initial-element id))
+	   (object-data dialog 'responses)
+	   (make-array 1 :adjustable t :fill-pointer t 
+		       :initial-element response))
 	  0)))
       (error-p
-       (error "Invalid response: ~A" id))))))
-
-(defun %dialog-find-response-id (dialog response-id-num)
-  (if (< response-id-num 0)
-      (car
-       (rassoc
-	(list response-id-num)
-	(rest (type-expand-1 'response-type)) :test #'equal))
-    (aref (object-data dialog 'response-id-key) response-id-num )))
-
-
-(defmethod signal-connect ((dialog dialog) signal function &key object after)
-  (let ((response-id-num (%dialog-find-response-id-num dialog signal)))
-    (cond
-     (response-id-num
-      (call-next-method
-       dialog 'response
-       #'(lambda (dialog id)
-	   (when (= id response-id-num)
-	     (cond
-	      ((eq object t) (funcall function dialog))
-	      (object (funcall function object))
-	      (t (funcall function)))))
-       :object t :after after))
-    ((call-next-method)))))
+       (error "Invalid response: ~A" response))))))
+
+(defun dialog-find-response (dialog id)
+  "Finds a symbolic response given a numeric id"
+  (if (< id 0)
+      (int-to-response-type id)
+    (aref (object-data dialog 'responses) id)))
+
+
+(defmethod compute-signal-id ((dialog dialog) signal)
+  (if (dialog-response-id dialog signal)
+      (ensure-signal-id 'response dialog)
+    (call-next-method)))
 
+(defmethod compute-signal-function ((dialog dialog) signal function object)
+  (declare (ignore function object))
+  (let ((callback (call-next-method))
+	(id (dialog-response-id dialog signal)))
+    (if id
+	#'(lambda (dialog response)
+	    (when (= response id)
+	      (funcall callback dialog)))
+      callback)))
 
 (defbinding dialog-run () nil
   (dialog dialog))
 
-(defbinding dialog-response (dialog response-id) nil
+(defbinding dialog-response (dialog response) nil
   (dialog dialog)
-  ((%dialog-find-response-id-num dialog response-id nil t) int))
+  ((dialog-response-id dialog response nil t) int))
 
 
 (defbinding %dialog-add-button () button
   (dialog dialog)
   (text string)
-  (response-id-num int))
+  (response-id int))
 
 (defun dialog-add-button (dialog label &optional (response label)
 			  &key default object after)
   "Adds a button to the dialog."
-  (let* ((id (if (functionp response)
-		 label
-	       response))
-	 (id-num (%dialog-find-response-id-num dialog id t))
-	 (button (%dialog-add-button dialog label id-num)))
+  (let* ((signal (if (functionp response)
+		     label
+		   response))
+	 (id (dialog-response-id dialog signal t))
+	 (button (%dialog-add-button dialog label id)))
     (when (functionp response)
-       (signal-connect dialog id response :object object :after after))
+       (signal-connect dialog signal response :object object :after after))
     (when default
-      (%dialog-set-default-response dialog id-num))
+      (%dialog-set-default-response dialog id))
     button))
 
 
-(defbinding %dialog-add-action-widget () button
+(defbinding %dialog-add-action-widget () nil
   (dialog dialog)
   (action-widget widget)
-  (response-id-num int))
+  (response-id int))
 
 (defun dialog-add-action-widget (dialog widget &optional (response widget)
 				 &key default object after)
-  (let* ((id (if (functionp response)
-		 widget
-	       response))
-	 (id-num (%dialog-find-response-id-num dialog id t)))
-    (%dialog-add-action-widget dialog widget id-num)
+  (let* ((signal (if (functionp response)
+		     widget
+		   response))
+	 (id (dialog-response-id dialog signal t)))
+    (unless (widget-hidden-p widget)
+      (widget-show widget))
+    (%dialog-add-action-widget dialog widget id)
     (when (functionp response)
-       (signal-connect dialog id response :object object :after after))
+       (signal-connect dialog signal response :object object :after after))
     (when default
-      (%dialog-set-default-response dialog id-num))
+      (%dialog-set-default-response dialog id))
     widget))
 
 
 (defbinding %dialog-set-default-response () nil
   (dialog dialog)
-  (response-id-num int))
+  (response-id int))
 
-(defun dialog-set-default-response (dialog response-id)
+(defun dialog-set-default-response (dialog response)
   (%dialog-set-default-response
-   dialog (%dialog-find-response-id-num dialog response-id nil t)))
+   dialog (dialog-response-id dialog response nil t)))
 
-(defbinding dialog-set-response-sensitive (dialog response-id sensitive) nil
+(defbinding dialog-set-response-sensitive (dialog response sensitive) nil
   (dialog dialog)
-  ((%dialog-find-response-id-num dialog response-id nil t) int)
+  ((dialog-response-id dialog response nil t) int)
   (sensitive boolean))
 
 #+gtk2.6
-(defbinding alternative-dialog-button-order-p(&optional screen)
-  (screen (or null screen)))
+(defbinding alternative-dialog-button-order-p (&optional screen) boolean
+  (screen (or null gdk:screen)))
 
 #+gtk2.6
 (defbinding (dialog-set-alternative-button-order 
@@ -428,14 +696,25 @@ (defbinding (dialog-set-alternative-button-order
     (dialog new-order)
   (dialog dialog)
   ((length new-order) int)
-  ((map 'vector #'(lambda (id)
-		    (%dialog-find-response-id-num dialog id nil t))
+  ((map 'vector #'(lambda (response)
+		    (dialog-response-id dialog response nil t))
 	new-order) (vector int)))
 
 
+#+gtk2.8
+(progn
+  (defbinding %dialog-get-response-for-widget () int
+    (dialog dialog)
+    (widget widget))
+
+  (defun dialog-get-response-for-widget (dialog widget)
+    (dialog-find-response dialog (dialog-get-response-for-widget dialog widget))))
+
+
 (defmethod container-add ((dialog dialog) (child widget) &rest args)
   (apply #'container-add (dialog-vbox dialog) child args))
 
+
 (defmethod container-remove ((dialog dialog) (child widget))
   (container-remove (dialog-vbox dialog) child))
 
@@ -471,7 +750,7 @@ (defbinding entry-completion-set-match-func (completion function) nil
   (completion entry-completion)
   ((callback %entry-completion-match-func) pointer)
   ((register-callback-function function) unsigned-int)
-  ((callback %destroy-user-data) pointer))
+  ((callback user-data-destroy-func) pointer))
 
 (defbinding entry-completion-complete () nil
   (completion entry-completion))
@@ -495,6 +774,137 @@ (defbinding entry-completion-delete-action () nil
   (index int))
 
 
+;;; File Chooser
+
+(defmethod initialize-instance ((file-chooser file-chooser) &rest initargs 
+				&key filter filters shortcut-folder 
+				shortcut-folders shortcut-folder-uti
+				shortcut-folder-uris)
+  (declare (ignore filter filters shortcut-folder shortcut-folders 
+		   shortcut-folder-uti shortcut-folder-uris))
+  (prog1
+      (call-next-method)
+    (initial-add file-chooser #'file-chooser-add-filter
+     initargs :filer :filters)
+    (initial-add file-chooser #'file-chooser-add-shortcut-folder
+     initargs :shortcut-folder :shortcut-folders)
+    (initial-add file-chooser #'file-chooser-add-shortcut-folder-uri
+     initargs :shortcut-folder-uri :shortcut-folders-uris)))
+
+
+(defbinding file-chooser-select-filename () boolean
+  (file-chooser file-chooser)
+  (filename string))
+
+(defbinding file-chooser-unselect-filename () nil
+  (file-chooser file-chooser)
+  (filename string))
+
+(defbinding file-chooser-select-all () boolean
+  (file-chooser file-chooser))
+
+(defbinding file-chooser-unselect-all () boolean
+  (file-chooser file-chooser))
+  
+(defbinding file-chooser-get-filenames () (gslist string)
+  (file-chooser file-chooser))
+
+(defbinding file-chooser-select-uri () boolean
+  (file-chooser file-chooser)
+  (uri string))
+
+(defbinding file-chooser-unselect-uri () nil
+  (file-chooser file-chooser)
+  (uri string))
+
+(defbinding file-chooser-get-uris () (gslist string)
+  (file-chooser file-chooser))
+
+(defbinding file-chooser-add-filter () nil
+  (file-chooser file-chooser)
+  (filter file-filter))
+
+(defbinding file-chooser-remove-filter () nil
+  (file-chooser file-chooser)
+  (filter file-filter))
+
+(defbinding file-chooser-list-filters () (gslist file-filter)
+  (file-chooser file-chooser))
+
+(defbinding file-chooser-add-shortcut-folder () boolean
+  (file-chooser file-chooser)
+  (folder string)
+  (nil null))
+
+(defbinding file-chooser-remove-shortcut-folder () nil
+  (file-chooser file-chooser)
+  (folder string)
+  (nil null))
+
+(defbinding file-chooser-list-shortcut-folders () (gslist string)
+  (file-chooser file-chooser))
+
+(defbinding file-chooser-add-shortcut-folder-uri () boolean
+  (file-chooser file-chooser)
+  (uri string)
+  (nil null))
+
+(defbinding file-chooser-remove-shortcut-folder-uri () nil
+  (file-chooser file-chooser)
+  (uri string)
+  (nil null))
+
+(defbinding file-chooser-list-shortcut-folder-uris () (gslist string)
+  (file-chooser file-chooser))
+
+
+;;; File Filter
+
+(defmethod initialize-instance ((file-filter file-filter) &rest initargs 
+				&key mime-type mime-types pattern patterns
+				pixbuf-formats)
+  (declare (ignore mime-type mime-types pattern patterns))
+  (prog1
+      (call-next-method)
+    (when pixbuf-formats
+      #-gtk2.6(warn "Initarg :PIXBUF-FORMATS not supportet in this version of Gtk")
+      #+gtk2.6(file-filter-add-pixbuf-formats file-filter))
+    (initial-add file-filter #'file-filter-add-mime-type
+     initargs :mime-type :mime-types)
+    (initial-add file-filter #'file-filter-add-pattern
+     initargs :pattern :patterns)))
+
+
+(defbinding file-filter-add-mime-type () nil
+  (filter file-filter)
+  (mime-type string))
+
+(defbinding file-filter-add-pattern () nil
+  (filter file-filter)
+  (pattern string))
+
+#+gtk2.6
+(defbinding file-filter-add-pixbuf-formats () nil
+  (filter file-filter))
+
+(def-callback-marshal %file-filter-func (boolean file-filter-info))
+
+(defbinding file-filter-add-custom (filter needed function) nil
+  (filter file-filter)
+  (needed file-filter-flags)
+  ((callback %file-filter-func) pointer)
+  ((register-callback-function function) unsigned-int)
+  ((callback user-data-destroy-func) pointer))
+
+(defbinding file-filter-get-needed () file-filter-flags
+  (filter file-filter))
+
+(defbinding file-filter-filter () boolean
+  (filter file-filter)
+  (filter-info file-filter-info))
+
+
+
 ;;; Image
 
 (defbinding image-set-from-file () nil
@@ -517,7 +927,7 @@ (defmethod initialize-instance ((image image) &rest initargs &key pixmap file)
       (image-set-from-file image file)))
    ((call-next-method))))
 
-(defun create-image (source &optional mask)
+(defun create-image-widget (source &optional mask)
   (etypecase source
     (gdk:pixbuf (make-instance 'image :pixbuf source))
     (string (make-instance 'image :stock source))
@@ -525,12 +935,17 @@ (defun create-image (source &optional mask)
     ((or list vector) (make-instance 'image :pixmap source))
     (gdk:pixmap (make-instance 'image :pixmap source :mask mask))))
 
+#+gtk2.8
+(defbinding image-clear () nil
+  (image image))
+
+
 
 ;;; Image menu item
 
 (defmethod initialize-instance ((item image-menu-item) &rest initargs &key image)
   (if (and image (not (typep image 'widget)))
-      (apply #'call-next-method item :image (create-image image) initargs) 
+      (apply #'call-next-method item :image (create-image-widget image) initargs) 
     (call-next-method)))
 
 
@@ -538,11 +953,17 @@ (defmethod (setf image-menu-item-image) ((widget widget) (item image-menu-item))
   (setf (slot-value item 'image) widget))
 
 (defmethod (setf image-menu-item-image) (image (item image-menu-item))
-  (setf (image-menu-item-image item) (create-image image)))
+  (setf (image-menu-item-image item) (create-image-widget image)))
 
 
 ;;; Label
 
+(defmethod shared-initialize ((label label) names &key pattern)
+  (declare (ignore names))
+  (call-next-method)
+  (when pattern
+    (setf (label-pattern label) pattern)))
+
 (defbinding label-get-layout-offsets () nil
   (label label)
   (x int :out)
@@ -569,16 +990,34 @@ (defbinding %radio-button-set-group () nil
   (radio-button radio-button)
   (group pointer))
 
-(defun radio-button-add-to-group (button1 button2)
+(defmethod add-to-radio-group ((button1 radio-button) (button2 radio-button))
   "Add BUTTON1 to the group which BUTTON2 belongs to."
   (%radio-button-set-group button1 (%radio-button-get-group button2)))
 
+(defun %add-activate-callback (widget signal function object after)
+  (if object
+      (signal-connect widget signal
+       #'(lambda (object)
+	   (when (slot-value widget 'active)
+	     (funcall function object (slot-value widget 'value))))
+       :object object :after after)
+    (signal-connect widget signal 
+     #'(lambda ()
+	 (when (slot-value widget 'active)
+	   (funcall function (slot-value widget 'value))))
+     :after after)))
+
+(defmethod activate-radio-widget ((button radio-button))
+  (signal-emit button 'clicked))
+
+(defmethod add-activate-callback ((button radio-button) function &key object after)
+  (%add-activate-callback button 'clicked function object after))
 
 (defmethod initialize-instance ((button radio-button) &key group)
   (prog1
       (call-next-method)
     (when group
-      (radio-button-add-to-group button group))))
+      (add-to-radio-group button group))))
 
 
 ;;; Item
@@ -643,7 +1082,7 @@ (defbinding menu-item-toggle-size-allocate () nil
 ;;; Menu tool button
 
 #+gtk2.6
-(defbinding menu-tool-button-set-arrow-tip () nil
+(defbinding menu-tool-button-set-arrow-tooltip () nil
   (menu-tool-button menu-tool-button)
   (tooltips tooltips)
   (tip-text string)
@@ -652,30 +1091,28 @@ (defbinding menu-tool-button-set-arrow-tip () nil
 
 ;;; Message dialog
 
-(defmethod initialize-instance ((dialog message-dialog) &rest initargs 
-				&key (type :info) (buttons :close) ; or :ok? 
-				flags message parent)
-  (remf initargs :parent)
-  (setf 
-   (slot-value dialog 'location)
-   (%message-dialog-new parent flags type buttons nil))
-  (message-dialog-set-markup dialog message)
-  (apply #'call-next-method dialog initargs))
+(defmethod allocate-foreign ((dialog message-dialog) &key (message-type :info)
+			     (buttons :close) flags transient-parent)
+  (%message-dialog-new transient-parent flags message-type buttons))
 
 
-(defbinding %message-dialog-new () pointer
-  (parent (or null window))
-  (flags dialog-flags)
-  (type message-type)
-  (buttons buttons-type)
-  (message (or null string)))
+(defmethod shared-initialize ((dialog message-dialog) names
+			      &key text #+gtk 2.6 secondary-text)
+  (declare (ignore names))
+  (when text
+    (message-dialog-set-markup dialog text))
+  #+gtk2.6
+  (when secondary-text
+    (message-dialog-format-secondary-markup dialog secondary-text))
+  (call-next-method))
 
-(defbinding %message-dialog-new-with-markup () pointer
+
+(defbinding %message-dialog-new () pointer
   (parent (or null window))
   (flags dialog-flags)
   (type message-type)
   (buttons buttons-type)
-  (message string))
+  (nil null))
 
 (defbinding message-dialog-set-markup () nil
   (message-dialog message-dialog)
@@ -702,15 +1139,22 @@ (defbinding %radio-menu-item-set-group () nil
   (radio-menu-item radio-menu-item)
   (group pointer))
 
-(defun radio-menu-item-add-to-group (item1 item2)
+(defmethod activate-radio-widget ((item radio-menu-item))
+  (menu-item-activate item))
+
+(defmethod add-to-radio-group ((item1 radio-menu-item) (item2 radio-menu-item))
   "Add ITEM1 to the group which ITEM2 belongs to."
   (%radio-menu-item-set-group item1 (%radio-menu-item-get-group item2)))
 
+(defmethod add-activate-callback ((item radio-menu-item) function &key object after)
+  (%add-activate-callback item 'activate function object after))
+
 (defmethod initialize-instance ((item radio-menu-item) &key group)
   (prog1
       (call-next-method)
     (when group
-      (radio-menu-item-add-to-group item group))))
+      (add-to-radio-group item group))))
+
   
 
 ;;; Radio tool button
@@ -722,16 +1166,21 @@ (defbinding %radio-tool-button-set-group () nil
   (radio-tool-button radio-tool-button)
   (group pointer))
 
-(defun radio-tool-button-add-to-group (button1 button2)
+(defmethod activate-radio-widget ((button radio-tool-button))
+  (signal-emit button 'clicked))
+
+(defmethod add-to-radio-group ((button1 radio-tool-button) (button2 radio-tool-button))
   "Add BUTTON1 to the group which BUTTON2 belongs to."
   (%radio-tool-button-set-group button1 (%radio-tool-button-get-group button2)))
-
+(defmethod add-activate-callback ((button radio-tool-button) function &key object after)
+  (%add-activate-callback button 'clicked function object after))
 
 (defmethod initialize-instance ((button radio-tool-button) &key group)
   (prog1
       (call-next-method)
     (when group
-      (radio-tool-button-add-to-group button group))))
+      (add-to-radio-group button group))))
+
 
 
 ;;; Toggle button
@@ -837,9 +1286,24 @@ (defbinding window-propagate-key-event () boolean
   (window window)
   (event gdk:key-event))
 
+#-gtk2.8
 (defbinding window-present () nil
   (window window))
 
+#+gtk2.8
+(progn
+  (defbinding %window-present () nil
+    (window window))
+
+  (defbinding %window-present-with-time () nil
+    (window window)
+    (timespamp unsigned-int))
+
+  (defun window-present (window &optional timestamp)
+    (if timestamp
+	(%window-present-with-time window timestamp)
+      (%window-present window))))
+
 (defbinding window-iconify () nil
   (window window))
 
@@ -903,7 +1367,7 @@ (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)
+(defbinding %window-get-icon-list () (glist (copy-of gdk:pixbuf))
   (window window))
 
 (defbinding window-get-position () nil
@@ -1025,12 +1489,12 @@ (defbinding scrolled-window-add-with-viewport () nil
    (scrolled-window scrolled-window)
    (child widget))
 
-(defmethod initialize-instance ((window scrolled-window) &rest initargs 
-				&key policy)
-  (if policy
-      (apply #'call-next-method window 
-       :vscrollbar-policy policy :hscrollbar-policy policy initargs)
-    (call-next-method)))
+(defmethod shared-initialize ((window scrolled-window) names &key policy)
+  (declare (ignore names))
+  (when policy 
+    (setf (slot-value window 'hscrollbar-policy) policy)
+    (setf (slot-value window 'vscrollbar-policy) policy))
+  (call-next-method))
 
 
 ;;; Statusbar
@@ -1071,20 +1535,15 @@ (defbinding fixed-move () nil
 
 ;;; Notebook
 
-(defun %notebook-position (notebook page)
+(defun %ensure-notebook-position (notebook page)
   (etypecase page
-    (int page)
-    (keyword (case page
-	       (:first 0)
-	       (:last -1)
-	       (t (error "Invalid position keyword: ~A" page))))
+    (position page)
     (widget (notebook-page-num notebook page t))))
 
-(defun %notebook-child (notebook position)
+(defun %ensure-notebook-child (notebook position)
   (typecase position
      (widget position)
-     (t (notebook-nth-page-child notebook position))))
-
+     (t (notebook-get-nth-page notebook position))))
 
 (defbinding (notebook-insert "gtk_notebook_insert_page_menu")
     (notebook position child tab-label &optional menu-label) nil
@@ -1096,7 +1555,7 @@ (defbinding (notebook-insert "gtk_notebook_insert_page_menu")
   ((if (stringp menu-label)
        (make-instance 'label :label menu-label)
      menu-label) (or null widget))
-  ((%notebook-position notebook position) int))
+  ((%ensure-notebook-position notebook position) position))
 
 (defun notebook-append (notebook child tab-label &optional menu-label)
   (notebook-insert notebook :last child tab-label menu-label))
@@ -1106,7 +1565,7 @@ (defun notebook-prepend (notebook child tab-label &optional menu-label)
   
 (defbinding notebook-remove-page (notebook page) nil
   (notebook notebook)
-  ((%notebook-position notebook page) int))
+  ((%ensure-notebook-position notebook page) position))
 
 (defbinding %notebook-page-num () int
   (notebook notebook)
@@ -1116,7 +1575,7 @@ (defun notebook-page-num (notebook child &optional error-p)
   (let ((page-num (%notebook-page-num notebook child)))
     (if (= page-num -1)
 	(when error-p
-	  (error "~A is not a child of ~A" child notebook))
+	  (error "~A is not a page in ~A" child notebook))
       page-num)))
 
 (defbinding notebook-next-page () nil
@@ -1128,7 +1587,7 @@ (defbinding notebook-prev-page () nil
 (defbinding notebook-reorder-child (notebook child position) nil
   (notebook notebook)
   (child widget)
-  ((%notebook-position notebook position) int))
+  ((%ensure-notebook-position notebook position) int))
 
 (defbinding notebook-popup-enable () nil
   (notebook notebook))
@@ -1136,46 +1595,26 @@ (defbinding notebook-popup-enable () nil
 (defbinding notebook-popup-disable () nil
   (notebook notebook))
 
-(defbinding (notebook-nth-page-child "gtk_notebook_get_nth_page")
-    (notebook page) widget
+(defbinding notebook-get-nth-page () widget
   (notebook notebook)
-  ((case page
-     (:first 0)
-     (:last -1)
-     (t page)) int))
+  (page position))
 
-
-(defbinding %notebook-get-current-page () int
-  (notebook notebook))
-
-(defun notebook-current-page-num (notebook)
-  (let ((num (%notebook-get-current-page notebook)))
-    (when (>= num 0)
-      num)))
-
-(defun notebook-current-page (notebook)
-  (let ((page-num (notebook-current-page-num notebook)))
-    (when page-num
-      (notebook-nth-page-child notebook page-num))))
-
-(defbinding  %notebook-set-current-page () nil
-  (notebook notebook)
-  (page-num int))
+(defun %notebook-current-page (notebook)
+  (when (slot-boundp notebook 'current-page-num)
+    (notebook-get-nth-page notebook (notebook-current-page-num notebook))))
 
 (defun (setf notebook-current-page) (page notebook)
-  (%notebook-set-current-page notebook (%notebook-position notebook page))
-  page)
-
+  (setf (notebook-current-page notebook) (notebook-page-num notebook page)))
 
 (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
     (notebook page) widget
   (notebook notebook)
-  ((%notebook-child notebook page) widget))
+  ((%ensure-notebook-child notebook page) widget))
 
 (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
     (notebook page) (copy-of string)
   (notebook notebook)
-  ((%notebook-child notebook page) widget))
+  ((%ensure-notebook-child notebook page) widget))
 
 (defbinding %notebook-set-tab-label () nil
   (notebook notebook)
@@ -1186,19 +1625,19 @@ (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)
+    (%notebook-set-tab-label notebook (%ensure-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))
+  ((%ensure-notebook-child notebook page) widget))
 
 (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
     (notebook page) (copy-of string)
   (notebook notebook)
-  ((%notebook-child notebook page) widget))
+  ((%ensure-notebook-child notebook page) widget))
 
 (defbinding %notebook-set-menu-label () nil
   (notebook notebook)
@@ -1209,13 +1648,13 @@ (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)
+    (%notebook-set-menu-label notebook (%ensure-notebook-child notebook page) widget)
     widget))
 
 
 (defbinding notebook-query-tab-label-packing (notebook page) nil
   (notebook notebook)
-  ((%notebook-child notebook page) widget)
+  ((%ensure-notebook-child notebook page) widget)
   (expand boolean :out)
   (fill boolean :out)
   (pack-type pack-type :out))
@@ -1223,7 +1662,7 @@ (defbinding notebook-query-tab-label-packing (notebook page) nil
 (defbinding notebook-set-tab-label-packing
     (notebook page expand fill pack-type) nil
   (notebook notebook)
-  ((%notebook-child notebook page) widget)
+  ((%ensure-notebook-child notebook page) widget)
   (expand boolean)
   (fill boolean)
   (pack-type pack-type))
@@ -1249,16 +1688,25 @@ (defbinding paned-pack2 () nil
 
 (defbinding layout-put () nil
   (layout layout)
-  (widget widget)
+  (child widget)
   (x int)
   (y int))
 
 (defbinding layout-move () nil
   (layout layout)
-  (widget widget)
+  (child widget)
   (x int)
   (y int))
 
+(defbinding layout-set-size () nil
+  (layout layout)
+  (width unsigned-int)
+  (height unsigned-int))
+
+(defbinding layout-get-size () nil
+  (layout layout)
+  (width unsigned-int :out)
+  (height unsigned-int :out))
 
 
 ;;; Menu shell
@@ -1475,119 +1923,83 @@ (defun table-col-spacing (table &optional col)
 
 ;;; Toolbar
 
-(defbinding %toolbar-insert-element () widget
-  (toolbar toolbar)
-  (type toolbar-child-type)
-  (widget (or null widget))
-  (text string)
-  (tooltip-text string)
-  (tooltip-private-text string)
-  (icon (or null widget))
-  (nil null)
-  (nil null)
-  (position int))
+(defmethod initialize-instance ((toolbar toolbar) &rest initargs &key tooltips)
+  (if (eq tooltips t)
+      (apply #'call-next-method toolbar
+       :tooltips (make-instance 'tooltips) initargs)
+    (call-next-method)))
 
-(defbinding %toolbar-insert-stock () widget
+(defbinding %toolbar-insert () nil
   (toolbar toolbar)
-  (stock-id string)
-  (tooltip-text string)
-  (tooltip-private-text string)
-  (nil null)
-  (nil null)
-  (position int))
-
-(defun toolbar-insert (toolbar position element
-		       &key tooltip-text tooltip-private-text
-		       type icon group callback object)
-  (let* ((numpos (case position
-		   (:first -1)
-		   (:last 0)
-		   (t position)))
-	 (widget
-	  (cond
-	   ((or
-	     (eq type :space)
-	     (and (not type) (eq element :space)))
-	    (%toolbar-insert-element
-	     toolbar :space nil nil
-	     tooltip-text tooltip-private-text nil numpos))
-	   ((or
-	     (eq type :widget)
-	     (and (not type) (typep element 'widget)))
-	    (%toolbar-insert-element
-	     toolbar :widget element nil
-	     tooltip-text tooltip-private-text nil numpos))
-	   ((or
-	     (eq type :stock)
-	     (and
-	      (not type)
-	      (typep element 'string)
-	      (stock-lookup element)))
-	    (%toolbar-insert-stock
-	     toolbar element tooltip-text tooltip-private-text numpos))
-	   ((typep element 'string)
-	    (%toolbar-insert-element
-	     toolbar (or type :button) (when (eq type :radio-button) group)
-	     element tooltip-text tooltip-private-text 
-	     (etypecase icon
-	       (null nil)
-	       (widget icon)
-	       (string (make-instance 'image :stock icon))
-	       (pathname (make-instance 'image :file icon))
-	       ((or list vector)
-		(make-instance 'image 
-		 :pixmap icon ; :icon-size (toolbar-icon-size toolbar)
-		 )))
-	     numpos))
-	   ((error "Invalid element type: ~A" element)))))
-    (when callback
-      (signal-connect widget 'clicked callback :object object))
-    widget))
-
-(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 :object object))
+  (tool-item tool-item)
+  (position position))
 
-(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 :object object))
+(defun toolbar-insert (toolbar tool-item &optional (position :end))
+  (%toolbar-insert toolbar tool-item position)
+  (%tool-item-update-tooltips tool-item))
 
+(defbinding toolbar-get-item-index () int
+  (toolbar toolbar)
+  (item tool-item))
 
-(defun toolbar-insert-space (toolbar position)
-  (toolbar-insert toolbar position :space))
+(defbinding toolbar-get-nth-item () tool-item
+  (toolbar toolbar)
+  (n int))
 
-(defun toolbar-append-space (toolbar)
-  (toolbar-append toolbar :space))
+(defbinding toolbar-get-drop-index () int
+  (toolbar toolbar)
+  (x int) (y int))
 
-(defun toolbar-prepend-space (toolbar)
-  (toolbar-prepend toolbar :space))
+(defbinding toolbar-set-drop-highlight-item () nil
+  (toolbar toolbar)
+  (tool-item tool-item)
+  (index int))
 
 
-(defun toolbar-enable-tooltips (toolbar)
-  (setf (toolbar-tooltips-p toolbar) t))
+;;; Tool button
 
-(defun toolbar-disable-tooltips (toolbar)
-  (setf (toolbar-tooltips-p toolbar) nil))
+(defmethod initialize-instance ((button tool-button) &rest initargs &key icon)
+  (if (and icon (not (typep icon 'widget)))
+      (apply #'call-next-method button :icon (create-image-widget icon) initargs)
+    (call-next-method)))
 
 
-(defbinding toolbar-remove-space () nil
-  (toolbar toolbar)
-  (position int))
+;;; Tool item
 
-(defbinding toolbar-unset-icon-size () nil
-  (toolbar toolbar))
+(defbinding tool-item-set-tooltip () nil
+  (tool-item tool-item)
+  (tooltips tooltips)
+  (tip-text string)
+  (tip-private string))
 
-(defbinding toolbar-unset-style () nil
-  (toolbar toolbar))
 
+(defun %tool-item-update-tooltips (tool-item)
+  (when (and 
+	 (slot-boundp tool-item 'parent)
+	 (or 
+	  (user-data-p tool-item 'tip-text)
+	  (user-data-p tool-item 'tip-private)))
+    (tool-item-set-tooltip
+     tool-item (toolbar-tooltips (widget-parent tool-item))
+     (or (user-data tool-item 'tip-text) "")
+     (or (user-data tool-item 'tip-private) ""))))
+
+(defmethod (setf tool-item-tip-text) ((tip-text string) (tool-item tool-item))
+  (setf (user-data tool-item 'tip-text) tip-text)
+  (%tool-item-update-tooltips tool-item)
+  tip-text)
+
+(defmethod (setf tool-item-tip-private) ((tip-private string) (tool-item tool-item))
+  (setf (user-data tool-item 'tip-private) tip-private)
+  (%tool-item-update-tooltips tool-item)
+  tip-private)
+
+(defmethod container-add ((toolbar toolbar) (tool-item tool-item) &rest args)
+  (declare (ignore args))
+  (prog1
+      (call-next-method)
+    (%tool-item-update-tooltips tool-item)))
 
-;;; Tool item
 
 (defbinding tool-item-retrieve-proxy-menu-item () widget
   (tool-item tool-item))
@@ -1627,7 +2039,7 @@ (defbinding editable-insert-text (editable text &optional (position 0)) nil
   (editable editable)
   (text string)
   ((length text) int)
-  (position editable-position :in-out))
+  (position position :in-out))
 
 (defun editable-append-text (editable text)
   (editable-insert-text editable text nil))
@@ -1689,10 +2101,16 @@ (defbinding spin-button-get-range () nil
 (defun spin-button-value-as-int (spin-button)
   (round (spin-button-value spin-button)))
 
-(defbinding spin-button-spin () nil
+(defbinding %spin-button-spin () nil
   (spin-button spin-button)
   (direction spin-type)
-  (increment single-float))
+  (increment double-float))
+
+(defun spin-button-spin (spin-button value)
+  (etypecase value
+    (real (%spin-button-spin spin-button :spin-user-defined value))
+    (spin-type (%spin-button-spin spin-button value 0))))
+
 
 (defbinding spin-button-update () nil
   (spin-button spin-button))
@@ -1708,11 +2126,12 @@ (defbinding ruler-set-range () nil
   (position single-float)
   (max-size single-float))
 
-(defbinding ruler-draw-ticks () nil
-  (ruler ruler))
-
-(defbinding ruler-draw-pos () nil
-  (ruler ruler))
+(defbinding ruler-get-range () nil
+  (ruler ruler)
+  (lower single-float :out)
+  (upper single-float :out)
+  (position single-float :out)
+  (max-size single-float :out))
 
 
 
@@ -1755,9 +2174,10 @@ (defbinding range-set-increments () nil
 
 ;;; Scale
 
-; (defbinding scale-draw-value () nil
-;   (scale scale))
-
+(defbinding scale-get-layout-offsets () nil
+  (scale scale)
+  (x int :out)
+  (y int :out))
 
 
 ;;; Progress bar
@@ -1812,7 +2232,7 @@ (defbinding %stock-lookup () boolean
 
 (defun stock-lookup (stock-id)
   (let ((location 
-	 (allocate-memory (proxy-instance-size (find-class 'stock-item)))))
+	 (allocate-memory (foreign-size (find-class 'stock-item)))))
     (unwind-protect
 	(when (%stock-lookup stock-id location)
 	  (ensure-proxy-instance 'stock-item (%stock-item-copy location)))
@@ -1850,7 +2270,7 @@ (defbinding tooltips-get-info-from-tip-window () boolean
   (current-widget widget :out))
 
 
-;;; Rc
+;;; Resource Files
 
 (defbinding rc-add-default-file (filename) nil
   ((namestring (truename filename)) string))
@@ -1865,84 +2285,3 @@ (defbinding rc-reparse-all () nil)
 
 (defbinding rc-get-style () style
   (widget widget))
-
-
-
-;;; Accelerator Groups
-#|
-(defbinding accel-group-activate (accel-group key modifiers) boolean
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding accel-groups-activate (object key modifiers) boolean
-  (object object)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding accel-group-attach () nil
-  (accel-group accel-group)
-  (object object))
-
-(defbinding accel-group-detach () nil
-  (accel-group accel-group)
-  (object object))
-
-(defbinding accel-group-lock () nil
-  (accel-group accel-group))
-
-(defbinding accel-group-unlock () nil
-  (accel-group accel-group))
-
-
-;;; Accelerator Groups Entries
-
-(defbinding accel-group-get-entry (accel-group key modifiers) accel-entry
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding accel-group-lock-entry (accel-group key modifiers) nil
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding accel-group-unlock-entry (accel-group key modifiers) nil
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-
-(defbinding accel-group-add
-    (accel-group key modifiers flags object signal) nil
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type)
-  (flags accel-flags)
-  (object object)
-  ((name-to-string signal) string))
-
-(defbinding accel-group-add (accel-group key modifiers object) nil
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type)
-  (object object))
-
-
-;;; Accelerator Signals
-
-(defbinding accel-group-handle-add
-    (object signal-id accel-group key modifiers flags) nil
-  (object object)
-  (signal-id unsigned-int)
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type)
-  (flags accel-flags))
-
-(defbinding accel-group-handle-remove
-    (object accel-group key modifiers) nil
-  (object object)
-  (accel-group accel-group)
-  ((gdk:keyval-from-name key) unsigned-int)
-  (modifiers gdk:modifier-type))
-|#