;; 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
;; 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.13 2002/03/24 15:42:17 espen Exp $
(in-package "GTK")
:initarg :height
:type int))
(:metaclass boxed-class)
- (:alien-name "GtkRequisition"))
+ (:alien-name "GtkTypeRequisition"))
+
+(defclass allocation (struct)
+ ((x
+ :allocation :alien
+ :accessor allocation-width
+ :initarg :x
+ :type int)
+ (y
+ :allocation :alien
+ :accessor allocation-width
+ :initarg :width
+ :type int)
+ (width
+ :allocation :alien
+ :accessor allocation-width
+ :initarg :width
+ :type int)
+ (height
+ :allocation :alien
+ :accessor allocation-height
+ :initarg :height
+ :type int))
+ (:metaclass proxy-class))
(defclass border (boxed)
((left
:initarg :bottom
:type int))
(:metaclass boxed-class)
- (:alien-name "GtkBorder"))
+ (:alien-name "GtkTypeBorder"))
(defclass adjustment (%object)
((lower
: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
: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"))
("GtkAdjustment" :ignore t)
- ;; Temporary disabled
- ("GtkCellRenderer" :ignore-prefix t)
-
-
;; Manual override
("GtkWidget"
:slots
:allocation :instance
:accessor widget-child-slots
:type container-child)
- (parent
+ (parent-window
: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.")
+ :getter "gtk_widget_get_parent_window"
+ :setter "gtk_widget_set_parent_window"
+ :accessor widget-parent-window
+ :type gdk:window)
(window
:allocation :virtual
:getter "gtk_widget_get_window"
(colormap
:allocation :virtual
:getter "gtk_widget_get_colormap"
- :reader widget-colormap
+ :setter "gtk_widget_set_colormap"
+ :initarg :colormap
+ :accessor widget-colormap
:type gdk:colormap)
(visual
:allocation :virtual
:getter "gtk_widget_get_visual"
:reader widget-visual
- :type gdk:visual)))
-
+ :type gdk:visual)
+ (direction
+ :allocation :virtual
+ :getter "gtk_widget_get_direction"
+ :setter "gtk_widget_set_direction"
+ :accessor widget-direction
+ :initarg :direction
+ :type text-direction)
+ (composite-name
+ :allocation :virtual
+ :getter "gtk_widget_get_composite_name"
+ :setter "gtk_widget_set_composite_name"
+ :accessor widget-composite-name
+ :initarg :composite-name
+ :type string)
+ (settings
+ :allocation :virtual
+ :getter "gtk_widget_get_settings"
+ :accessor widget-settings
+ :type settings)
+ (child-visible
+ :allocation :virtual
+ :getter "gtk_widget_get_child_visible"
+ :setter "gtk_widget_set_child_visible"
+ :accessor widget-child-visible-p
+ :initarg :child-visible
+ :type boolean)))
+
("GtkContainer"
:slots
((child
:accessor container-focus-child
:initarg :focus-child
:type widget)
+ (focus-chain
+ :allocation :virtual
+ :getter container-focus-chain
+ :setter (setf container-focus-chain))
(focus-hadjustment
:allocation :virtual
:getter "gtk_container_get_focus_hadjustment"
: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
("GtkDialog"
:slots
- ((vbox
+ ((main-area
:allocation :virtual
:getter "gtk_dialog_get_vbox"
- :reader dialog-vbox
+ :reader dialog-main-area
:type widget)
(action-area
:allocation :virtual
((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)
("GtkList" :ignore-prefix t)
("GtkTree" :ignore t)
("GtkTreeItem" :ignore t)
- ("GtkText" :ignore-prefix t)
+ ("GtkText" :ignore-prefix t :except ("GtkTextDirection"))
("GtkPacker" :ignore-prefix t)
("GtkPixmap" :ignore t)
("GtkPreview" :ignore-prefix t)