X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/5b51dee1aee2ce5404ebbfd949020fbe33b9eadd..f9e76ebedea0ba6c60589cf75b0327794e800d7a:/gtk/gtktypes.lisp diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index d508502..6492c28 100644 --- 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 +;; Copyright (C) 1999-2001 Espen S. Johnsen ;; ;; 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.14 2002-03-24 21:54:33 espen Exp $ (in-package "GTK") @@ -32,7 +32,30 @@ :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 @@ -56,7 +79,7 @@ :initarg :bottom :type int)) (:metaclass boxed-class) - (:alien-name "GtkBorder")) + (:alien-name "GtkTypeBorder")) (defclass adjustment (%object) ((lower @@ -69,10 +92,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 +109,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 +130,6 @@ ("GtkAdjustment" :ignore t) - ;; Temporary disabled - ("GtkCellRenderer" :ignore-prefix t) - - ;; Manual override ("GtkWidget" :slots @@ -113,13 +137,12 @@ :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" @@ -135,14 +158,42 @@ (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 @@ -158,6 +209,10 @@ :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" @@ -177,8 +232,84 @@ :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))) + + ("GtkWindow" + :slots + ((gravity + :allocation :virtual + :getter "gtk_window_get_gravity" + :setter "gtk_window_set_gravity" + :accessor window-gravity + :initarg :gravity + :type gdk:gravity) + (focus-widget + :allocation :virtual + :getter "gtk_window_get_focus" + :setter "gtk_window_set_focus" + :accessor window-focus-widget + :initarg :focus-widget + :type widget) + (default-widget + :allocation :virtual + :getter "gtk_window_get_default" + :setter "gtk_window_set_default" + :accessor window-default-widget + :initarg :default-widget + :type widget) + (decorated + :allocation :virtual + :getter "gtk_window_get_decorated" + :setter "gtk_window_set_decorated" + :accessor window-decorated-p + :initarg :decorated + :type boolean) + (has-frame + :allocation :virtual + :getter "gtk_window_get_has_frame" + :setter "gtk_window_set_has_frame" + :accessor window-has-frame-p + :initarg :has-frame + :type boolean) + (role + :allocation :virtual + :getter "gtk_window_get_role" + :setter "gtk_window_set_role" + :accessor window-role + :initarg :role + :type string) + (type-hint + :allocation :virtual + :getter "gtk_window_get_type_hint" + :setter "gtk_window_set_type_hint" + :accessor window-type-hint + :initarg :type-hint + :type gdk:window-type-hint) + (icon + :allocation :virtual + :getter window-icon + :setter (setf window-icon) + :initarg :icon) + (mnemonic-modifier + :allocation :virtual + :getter "gtk_window_get_mnemonic_modifier" + :setter "gtk_window_set_mnemonic_modifier" + :accessor window-mnemonic-modifier + :initarg :mnemonic-modifier + :type gdk:modifier-type) + (transient-for + :allocation :virtual + :getter "gtk_window_get_transient_for" + :setter "gtk_window_set_transient_for" + :accessor window-transient-for + :initarg :transient-for + :type window) + + + )) ("GtkTooltips" :slots @@ -358,10 +489,10 @@ ("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 @@ -416,20 +547,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) @@ -442,7 +560,7 @@ ("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)