Stock item bindings updated to Gtk+ 2.8

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index e52594af6076747b09786f73fb0298ed863856ee..0f14ffcfa7763c4b2efd8dbd7c05a7204b523b14 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2000 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 2000-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: gtkcontainer.lisp,v 1.17 2005/02/22 23:08:52 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.19 2006/02/19 19:31:14 espen Exp $
 
 (in-package "GTK")
 
@@ -84,11 +89,11 @@ (defbinding %container-child-set-property () nil
 (defbinding container-check-resize () nil
   (container container))
 
-(def-callback-marshal %foreach-callback (nil widget))
+(define-callback-marshal %foreach-callback nil (widget))
 
 (defbinding %container-foreach (container callback-id) nil
   (container container)
-  ((callback %foreach-callback) pointer)
+  (%foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun container-foreach (container function)
@@ -97,7 +102,7 @@ (defun container-foreach (container function)
 
 (defbinding %container-forall (container callback-id) nil
   (container container)
-  ((callback %foreach-callback) pointer)
+  (%foreach-callback callback)
   (callback-id unsigned-int))
 
 (defun container-forall (container function)