X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/5e17fb786e938559779fa96f283c23647c7d1f0b..8beedfa0f30e6f332112485c3e739937e45155f9:/gtk/gtktypes.lisp diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp index 6e2c5da..a31f9fa 100644 --- a/gtk/gtktypes.lisp +++ b/gtk/gtktypes.lisp @@ -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.21 2004-12-04 18:18:21 espen Exp $ +;; $Id: gtktypes.lisp,v 1.26 2004-12-26 11:51:21 espen Exp $ (in-package "GTK") @@ -127,14 +127,6 @@ (register-type 'tree-path "GtkTreePath") -(defclass text-iter (boxed) - ((dummy14 - :allocation :alien :offset #.(* 13 (size-of 'pointer)) - :type pointer)) - (:metaclass boxed-class)) - - - (define-types-by-introspection "Gtk" ;; Manually defined ("GtkObject" :ignore t) @@ -142,20 +134,15 @@ ("GtkBorder" :ignore t) ("GtkTreeIter" :ignore t) ("GtkTreePath" :ignore t) +; ("GtkStyle" :ignore t) ;; Manual override ("GtkWidget" :slots - ((child-slots + ((child-properties :allocation :instance - :accessor widget-child-slots + :accessor widget-child-properties :type container-child) - (parent-window - :allocation :virtual - :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" @@ -205,7 +192,11 @@ :setter "gtk_widget_set_child_visible" :accessor widget-child-visible-p :initarg :child-visible - :type boolean))) + :type boolean) + (width-request + :merge t :unbound -1) + (height-request + :merge t :unbound -1))) ("GtkContainer" :slots @@ -252,14 +243,7 @@ ("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 + ((focus-widget :allocation :virtual :getter "gtk_window_get_focus" :setter "gtk_window_set_focus" @@ -273,13 +257,6 @@ :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" @@ -287,25 +264,13 @@ :accessor window-has-frame-p :initarg :has-frame :type boolean) - (role + (icon-list :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) + :getter "gtk_window_get_icon_list" + :setter "gtk_window_set_icon_list" + :accessor window-icon-list + :initarg :icon-list + :type (glist gdk:pixbuf)) (mnemonic-modifier :allocation :virtual :getter "gtk_window_get_mnemonic_modifier" @@ -319,8 +284,24 @@ :setter "gtk_window_set_transient_for" :accessor window-transient-for :initarg :transient-for - :type window))) + :type window) + (group + :allocation :virtual + :getter "gtk_window_get_group" + :setter (setf window-group) + :reader window-group + :initarg :group + :type window-group) + (default-width :merge t :unbound -1) + (default-height :merge t :unbound -1))) + ("GtkWindowGroup" + :slots + ((grabs + :allocation :alien + :accessor window-group-grabs + :type (gslist window)))) + ("GtkTooltips" :slots ((enabled @@ -405,14 +386,16 @@ :slots ((child1 :allocation :virtual - :getter paned-child1 - :setter (setf paned-child1) + :getter "gtk_paned_get_child1" + :setter "gtk_paned_add1" + :accessor paned-child1 :initarg :child1 :type widget) (child2 :allocation :virtual - :getter paned-child2 - :setter (setf paned-child2) + :getter "gtk_paned_get_child2" + :setter "gtk_paned_add2" + :accessor paned-child2 :initarg :child2 :type widget))) @@ -534,6 +517,19 @@ :reader combo-entry :type entry))) + ("GtkEntryCompletion" + :slots + ((entry + :allocation :virtual + :getter "gtk_entry_completion_get_entry" + :reader entry-completion-entry + :type entry) + (minimum-key-length + :merge t :unbound -1) + #+gtk2.6 + (text-column + :merge t :unbound -1))) + ("GtkRadioButton" :slots ((group @@ -724,6 +720,25 @@ :accessor combo-box-active-iter :type tree-iter))) + ("GtkTextBuffer" + :slots + ((line-count + :allocation :virtual + :getter "gtk_text_buffer_get_line_count" + :reader text-buffer-line-count + :type int) + (char-count + :allocation :virtual + :getter "gtk_text_buffer_get_char_count" + :reader text-buffer-char-count + :type int) + (modified + :allocation :virtual + :getter "gtk_text_buffer_get_modified" + :setter "gtk_text_buffer_set_modified" + :accessor text-buffer-modifed-p + :type boolean))) + ("GtkTextView" :slots ((default-attributes @@ -732,6 +747,25 @@ :reader text-view-default-attributes :type text-attributes))) + ("GtkTextTagTable" + :slots + ((size + :allocation :virtual + :getter "gtk_text_tag_table_get_size" + :reader text-tag-table-size + :type int))) + + ("GtkTextTag" + :slots + ((priority + :allocation :virtual + :getter "gtk_text_tag_get_priority" + :setter "gtk_text_tag_set_priority" + :accessor text-tag-priority + :type int) + (weight + :merge t :type pango:weight))) + ("GtkUIManager" :type ui-manager :slots @@ -779,7 +813,7 @@ :allocation :virtual :getter radio-action-value))) - + ;; Not needed ("GtkFundamentalType" :ignore t) ("GtkArgFlags" :ignore t) @@ -809,3 +843,54 @@ ("GtkThemeEngine" :ignore t) ) + + +(defclass text-iter (boxed) + ((buffer + :allocation :virtual + :getter "gtk_text_iter_get_buffer" + :reader text-iter-buffer + :type text-buffer) + (offset + :allocation :virtual + :getter "gtk_text_iter_get_offset" + :setter "gtk_text_iter_set_offset" + :accessor text-iter-offset + :type int) + (line + :allocation :virtual + :getter "gtk_text_iter_get_line" + :setter "gtk_text_iter_set_line" + :accessor text-iter-line + :type int) + (line-offset + :allocation :virtual + :getter "gtk_text_iter_get_line_offset" + :setter "gtk_text_iter_set_line_offset" + :accessor text-iter-line-offset + :type int) + (line-index + :allocation :virtual + :getter "gtk_text_iter_get_line_index" + :setter "gtk_text_iter_set_line_index" + :accessor text-iter-line-index + :type int) + (visible-line-index + :allocation :virtual + :getter "gtk_text_iter_get_visible_line_index" + :setter "gtk_text_iter_set_visible_line_index" + :accessor text-iter-visible-line-index + :type int) + (visible-line-offset + :allocation :virtual + :getter "gtk_text_iter_get_visible_line_offset" + :setter "gtk_text_iter_set_visible_line_offset" + :accessor text-iter-visible-line-offset + :type int) + ;; Workaround to get correct size + (dummy14 + :allocation :alien :offset #.(* 13 (size-of 'pointer)) + :type pointer)) + (:metaclass boxed-class + ;; I am pretty sure this was working in older versons on CMUCL + :size #.(* 14 (size-of 'pointer))))