Updated and added new bindings for gtk 2.0

[clg] / gtk / gtktypes.lisp

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index d508502..41d998a 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0.x
-;; Copyright (C) 1999-2001 Espen S. Johnsen <esj@stud.cs.uit.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,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtktypes.lisp,v 1.8 2001-10-21 23:16:31 espen Exp $
+;; $Id: gtktypes.lisp,v 1.11 2002-03-19 19:09:18 espen Exp $
 
 
 (in-package "GTK")
@@ -32,7 +32,7 @@
     :initarg :height
     :type int))
   (:metaclass boxed-class)
-  (:alien-name "GtkRequisition"))
+  (:alien-name "GtkTypeRequisition"))
 
 (defclass border (boxed)
   ((left
@@ -56,7 +56,7 @@
     :initarg :bottom
     :type int))
   (:metaclass boxed-class)
-  (:alien-name "GtkBorder"))
+  (:alien-name "GtkTypeBorder"))
 
 (defclass adjustment (%object)
   ((lower
@@ -69,10 +69,8 @@
     :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
@@ -88,6 +86,13 @@
     :allocation :alien
     :accessor adjustment-page-size
     :initarg :page-size
+    :type single-float)
+   (value
+    :allocation :virtual
+    :getter "gtk_adjustment_get_value"
+    :setter "gtk_adjustment_set_value"
+    :accessor adjustment-value
+    :initarg :value
     :type single-float))
   (:metaclass gobject-class)
   (:alien-name "GtkAdjustment"))
@@ -102,10 +107,6 @@
   ("GtkAdjustment" :ignore t)
 
   
-  ;; Temporary disabled
-  ("GtkCellRenderer" :ignore-prefix t)
-
-  
   ;; Manual override
   ("GtkWidget"
    :slots
@@ -177,8 +178,10 @@
    :slots
    ((child
      :allocation :virtual
-     :getter bin-child
-     :setter (setf bin-child))))
+     :getter "gtk_bin_get_child"
+     :setter (setf bin-child)
+     :reader bin-child
+     :type widget)))
   
   ("GtkTooltips"
    :slots
@@ -416,20 +419,7 @@
    ((bin-window
      :getter "gtk_layout_get_bin_window"
      :reader layout-bin-window
-     :type gdk:window)
-    (x-offset
-     :getter "gtk_layout_get_xoffset"
-     :setter "gtk_layout_set_xoffset"
-     :accessor layout-x-offset
-     :initarg :x-offset
-     :type unsigned-int)
-    (y-offset
-     :getter "gtk_layout_get_yoffset"
-     :setter "gtk_layout_set_yoffset"
-     :accessor layout-y-offset
-     :initarg :x-offset
-     :type unsigned-int)))
-
+     :type gdk:window)))
      
   ;; Not needed
   ("GtkFundamentalType" :ignore t)