From 6bf9d046c93b9da5714c03b5efacdf55ff595862 Mon Sep 17 00:00:00 2001 From: Dmitry Kalyanov Date: Thu, 26 Mar 2009 22:22:10 +0300 Subject: [PATCH] Added GtkTextTag.priority property --- generating.lisp | 4 +- gtk/gtk.generated-classes.lisp | 99 +++++++++++++++++++++------------------- gtk/gtk.text.lisp | 15 +----- 3 files changed, 56 insertions(+), 62 deletions(-) diff --git a/generating.lisp b/generating.lisp index 326a6d9..6a30808 100644 --- a/generating.lisp +++ b/generating.lisp @@ -175,7 +175,9 @@ (:cffi gtk::composite-name gtk::widget-composite-name (glib:g-string :free-from-foreign t :free-to-foreign t) "gtk_widget_get_composite_name" "gtk_widget_set_composite_name") (:cffi gtk::redraw-on-allocate gtk::widget-redraw-on-allocate :boolean nil "gtk_widget_set_redraw_on_allocate") (:cffi gtk::accessible gtk::widget-accessible g-object "gtk_widget_get_accessible" nil) - (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object "gtk_widget_get_tooltip_window" "gtk_window_set_tooltip_window")))))) + (:cffi gtk::tooltip-window gtk::widget-tooltip-window g-object "gtk_widget_get_tooltip_window" "gtk_window_set_tooltip_window")) + ("GtkTextTag" + (:cffi gtk::priority gtk::text-tag-priority :int "gtk_text_tag_get_priority" "gtk_text_tag_set_priority")))))) (defun gtk-generate-child-properties (filename) (with-open-file (stream filename :direction :output :if-exists :supersede) diff --git a/gtk/gtk.generated-classes.lisp b/gtk/gtk.generated-classes.lisp index 9724f75..ddfba0b 100644 --- a/gtk/gtk.generated-classes.lisp +++ b/gtk/gtk.generated-classes.lisp @@ -7,15 +7,15 @@ (:export t :type-initializer "gtk_size_group_mode_get_type") (:none 0) (:horizontal 1) (:vertical 2) (:both 3)) -(define-g-enum "GtkUnit" unit (:export t :type-initializer "gtk_unit_get_type") - (:pixel 0) (:points 1) (:inch 2) (:mm 3)) - (define-g-enum "GtkPrintStatus" print-status (:export t :type-initializer "gtk_print_status_get_type") (:initial 0) (:preparing 1) (:generating-data 2) (:sending-data 3) (:pending 4) (:pending-issue 5) (:printing 6) (:finished 7) (:finished-aborted 8)) +(define-g-enum "GtkUnit" unit (:export t :type-initializer "gtk_unit_get_type") + (:pixel 0) (:points 1) (:inch 2) (:mm 3)) + (define-g-enum "GtkRecentSortType" recent-sort-type (:export t :type-initializer "gtk_recent_sort_type_get_type") (:none 0) (:mru 1) (:lru 2) (:custom 3)) @@ -38,16 +38,16 @@ "gtk_tree_view_column_sizing_get_type") (:grow-only 0) (:autosize 1) (:fixed 2)) +(define-g-enum "GtkProgressBarStyle" progress-bar-style + (:export t :type-initializer "gtk_progress_bar_style_get_type") + (:continuous 0) (:discrete 1)) + (define-g-enum "GtkProgressBarOrientation" progress-bar-orientation (:export t :type-initializer "gtk_progress_bar_orientation_get_type") (:left-to-right 0) (:right-to-left 1) (:bottom-to-top 2) (:top-to-bottom 3)) -(define-g-enum "GtkProgressBarStyle" progress-bar-style - (:export t :type-initializer "gtk_progress_bar_style_get_type") - (:continuous 0) (:discrete 1)) - (define-g-enum "GtkUpdateType" update-type (:export t :type-initializer "gtk_update_type_get_type") (:continuous 0) (:discontinuous 1) (:delayed 2)) @@ -82,14 +82,14 @@ (:export t :type-initializer "gtk_toolbar_style_get_type") (:icons 0) (:text 1) (:both 2) (:both-horiz 3)) -(define-g-enum "GtkWrapMode" wrap-mode - (:export t :type-initializer "gtk_wrap_mode_get_type") (:none 0) - (:char 1) (:word 2) (:word-char 3)) - (define-g-enum "GtkJustification" justification (:export t :type-initializer "gtk_justification_get_type") (:left 0) (:right 1) (:center 2) (:fill 3)) +(define-g-enum "GtkWrapMode" wrap-mode + (:export t :type-initializer "gtk_wrap_mode_get_type") (:none 0) + (:char 1) (:word 2) (:word-char 3)) + (define-g-enum "GtkButtonBoxStyle" button-box-style (:export t :type-initializer "gtk_button_box_style_get_type") (:default-style 0) (:spread 1) (:edge 2) (:start 3) (:end 4) @@ -562,28 +562,28 @@ (define-g-interface "GtkFileChooser" file-chooser (:export t :type-initializer "gtk_file_chooser_get_type") - (use-preview-label file-chooser-use-preview-label - "use-preview-label" "gboolean" t t) + (preview-widget-active file-chooser-preview-widget-active + "preview-widget-active" "gboolean" t t) + (file-system-backend file-chooser-file-system-backend + "file-system-backend" "gchararray" nil nil) + (filter file-chooser-filter "filter" "GtkFileFilter" t t) + (local-only file-chooser-local-only "local-only" "gboolean" + t t) + (extra-widget file-chooser-extra-widget "extra-widget" + "GtkWidget" t t) + (action file-chooser-action "action" "GtkFileChooserAction" + t t) + (select-multiple file-chooser-select-multiple + "select-multiple" "gboolean" t t) (do-overwrite-confirmation file-chooser-do-overwrite-confirmation "do-overwrite-confirmation" "gboolean" t t) - (select-multiple file-chooser-select-multiple - "select-multiple" "gboolean" t t) - (extra-widget file-chooser-extra-widget "extra-widget" - "GtkWidget" t t) (show-hidden file-chooser-show-hidden "show-hidden" "gboolean" t t) - (file-system-backend file-chooser-file-system-backend - "file-system-backend" "gchararray" nil nil) + (use-preview-label file-chooser-use-preview-label + "use-preview-label" "gboolean" t t) (preview-widget file-chooser-preview-widget "preview-widget" "GtkWidget" t t) - (filter file-chooser-filter "filter" "GtkFileFilter" t t) - (action file-chooser-action "action" "GtkFileChooserAction" - t t) - (local-only file-chooser-local-only "local-only" "gboolean" - t t) - (preview-widget-active file-chooser-preview-widget-active - "preview-widget-active" "gboolean" t t) (:cffi current-name file-chooser-current-name (:string :free-to-foreign t :encoding :utf-8) nil "gtk_file_chooser_set_current_name") @@ -636,18 +636,18 @@ t) (show-tips recent-chooser-show-tips "show-tips" "gboolean" t t) + (sort-type recent-chooser-sort-type "sort-type" + "GtkRecentSortType" t t) (recent-manager recent-chooser-recent-manager "recent-manager" "GtkRecentManager" nil nil) - (limit recent-chooser-limit "limit" "gint" t t) (show-not-found recent-chooser-show-not-found "show-not-found" "gboolean" t t) - (sort-type recent-chooser-sort-type "sort-type" - "GtkRecentSortType" t t) + (limit recent-chooser-limit "limit" "gint" t t) (show-icons recent-chooser-show-icons "show-icons" "gboolean" t t) - (show-private recent-chooser-show-private "show-private" - "gboolean" t t) (local-only recent-chooser-local-only "local-only" + "gboolean" t t) + (show-private recent-chooser-show-private "show-private" "gboolean" t t)) (define-g-interface "GtkToolShell" tool-shell @@ -744,9 +744,9 @@ :type-initializer "gtk_window_get_type") ((type gtk-window-type "type" "GtkWindowType" t nil) (title gtk-window-title "title" "gchararray" t t) - (role gtk-window-role "role" "gchararray" t t) (startup-id gtk-window-startup-id "startup-id" "gchararray" nil t) + (role gtk-window-role "role" "gchararray" t t) (allow-shrink gtk-window-allow-shrink "allow-shrink" "gboolean" t t) (allow-grow gtk-window-allow-grow "allow-grow" @@ -2463,26 +2463,20 @@ "gtk-enable-tooltips" "gboolean" t t) (gtk-button-images settings-gtk-button-images "gtk-button-images" "gboolean" t t) + (gtk-scrolled-window-placement + settings-gtk-scrolled-window-placement + "gtk-scrolled-window-placement" "GtkCornerType" t t) + (gtk-label-select-on-focus + settings-gtk-label-select-on-focus + "gtk-label-select-on-focus" "gboolean" t t) + (gtk-menu-images settings-gtk-menu-images + "gtk-menu-images" "gboolean" t t) (gtk-can-change-accels settings-gtk-can-change-accels "gtk-can-change-accels" "gboolean" t t) (gtk-menu-popup-delay settings-gtk-menu-popup-delay "gtk-menu-popup-delay" "gint" t t) (gtk-menu-popdown-delay settings-gtk-menu-popdown-delay "gtk-menu-popdown-delay" "gint" t t) - (gtk-entry-select-on-focus - settings-gtk-entry-select-on-focus - "gtk-entry-select-on-focus" "gboolean" t t) - (gtk-entry-password-hint-timeout - settings-gtk-entry-password-hint-timeout - "gtk-entry-password-hint-timeout" "guint" t t) - (gtk-label-select-on-focus - settings-gtk-label-select-on-focus - "gtk-label-select-on-focus" "gboolean" t t) - (gtk-menu-images settings-gtk-menu-images - "gtk-menu-images" "gboolean" t t) - (gtk-scrolled-window-placement - settings-gtk-scrolled-window-placement - "gtk-scrolled-window-placement" "GtkCornerType" t t) (gtk-menu-bar-popup-delay settings-gtk-menu-bar-popup-delay "gtk-menu-bar-popup-delay" "gint" t t) @@ -2491,7 +2485,13 @@ (gtk-toolbar-style settings-gtk-toolbar-style "gtk-toolbar-style" "GtkToolbarStyle" t t) (gtk-toolbar-icon-size settings-gtk-toolbar-icon-size - "gtk-toolbar-icon-size" "GtkIconSize" t t))) + "gtk-toolbar-icon-size" "GtkIconSize" t t) + (gtk-entry-select-on-focus + settings-gtk-entry-select-on-focus + "gtk-entry-select-on-focus" "gboolean" t t) + (gtk-entry-password-hint-timeout + settings-gtk-entry-password-hint-timeout + "gtk-entry-password-hint-timeout" "guint" t t))) (define-g-object-class "GtkRcStyle" rc-style (:superclass g-object :export t :interfaces nil @@ -2851,7 +2851,10 @@ "gboolean" t t) (paragraph-background-set text-tag-paragraph-background-set - "paragraph-background-set" "gboolean" t t))) + "paragraph-background-set" "gboolean" t t) + (:cffi priority text-tag-priority :int + "gtk_text_tag_get_priority" + "gtk_text_tag_set_priority"))) (define-g-object-class "GtkTextTagTable" text-tag-table (:superclass g-object :export t :interfaces nil diff --git a/gtk/gtk.text.lisp b/gtk/gtk.text.lisp index 5c16cdd..c02344f 100644 --- a/gtk/gtk.text.lisp +++ b/gtk/gtk.text.lisp @@ -675,7 +675,8 @@ (defun text-buffer-get-bounds (buffer) (let ((start (make-instance 'text-iter)) (end (make-instance 'text-iter))) - (gtk-text-buffer-get-bounds buffer start end))) + (gtk-text-buffer-get-bounds buffer start end) + (values start end))) (export 'text-buffer-get-bounds) @@ -830,18 +831,6 @@ ;; text tag -(defcfun (text-tag-priority "gtk_text_tag_get_priority") :int - (tag (g-object text-tag))) - -(defcfun gtk-text-tag-set-priority :void - (tag (g-object text-tag)) - (priority :int)) - -(defun (setf text-tag-priority) (new-value tag) - (gtk-text-tag-set-priority tag new-value)) - -(export 'text-tag-priority) - ;; text tag table (defcallback gtk-text-tag-table-foreach-function :void ((tag (g-object text-tag)) (data :pointer)) -- 1.7.10.4