From: Dmitry Kalyanov Date: Thu, 1 Oct 2009 19:56:38 +0000 (+0400) Subject: Work on GtkText* bindings X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=5d306b325953acfdffe38f05eca4dfb7cbc89fb7;p=cl-gtk2.git Work on GtkText* bindings --- diff --git a/generating.lisp b/generating.lisp index b71a545..bf3bd5a 100644 --- a/generating.lisp +++ b/generating.lisp @@ -320,7 +320,17 @@ (:cffi gtk::position gtk::editable-position :int "gtk_editable_get_position" "gtk_editable_set_position") (:cffi gtk::editable gtk::editable-editable :boolean - "gtk_editable_get_editable" "gtk_editable_set_editable")))))) + "gtk_editable_get_editable" "gtk_editable_set_editable")) + ("GtkTextMark" + (:cffi gtk::visible gtk::text-mark-visible :boolean + "gtk_text_mark_get_visible" "gtk_text_mark_set_visible") + (:cffi gtk::deleted gtk::text-mark-deleted :boolean + "gtk_text_mark_get_deleted" nil) + (:cffi gtk::buffer gtk::text-mark-buffer (g-object gtk::text-buffer) + "gtk_text_mark_get_buffer" nil)) + ("GtkTextBuffer" + (:cffi gtk::modified gtk::text-buffer-modified :boolean + "gtk_text_buffer_get_modified" "gtk_text_buffer_set_modified")))))) (defun gtk-generate-child-properties (filename) (with-open-file (stream filename :direction :output :if-exists :supersede) diff --git a/gtk/gtk.demo.lisp b/gtk/gtk.demo.lisp index 14ef3ec..3899649 100644 --- a/gtk/gtk.demo.lisp +++ b/gtk/gtk.demo.lisp @@ -638,7 +638,7 @@ (save)) (object-destroy d)))) (cut (&rest args) (declare (ignore args)) - (text-buffer-cut-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD"))) + (text-buffer-cut-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD") t)) (copy (&rest args) (declare (ignore args)) (text-buffer-copy-clipboard (text-view-buffer text-view) (get-clipboard "CLIPBOARD"))) (paste (&rest args) (declare (ignore args)) diff --git a/gtk/gtk.generated-classes.lisp b/gtk/gtk.generated-classes.lisp index 61a7d4c..e6faf8f 100644 --- a/gtk/gtk.generated-classes.lisp +++ b/gtk/gtk.generated-classes.lisp @@ -1398,11 +1398,6 @@ :type-initializer "gtk_recent_filter_get_type") nil) -(define-g-object-class "GtkTooltips" tooltips - (:superclass gtk-object :export t :interfaces nil - :type-initializer "gtk_tooltips_get_type") - nil) - (define-g-object-class "GtkTreeViewColumn" tree-view-column (:superclass gtk-object :export t :interfaces ("GtkBuildable" "GtkCellLayout") :type-initializer @@ -3332,7 +3327,10 @@ "paste-target-list" "GtkTargetList" t nil) (tag-table text-buffer-tag-table "tag-table" "GtkTextTagTable" t nil) - (text text-buffer-text "text" "gchararray" t t))) + (text text-buffer-text "text" "gchararray" t t) + (:cffi modified text-buffer-modified :boolean + "gtk_text_buffer_get_modified" + "gtk_text_buffer_set_modified"))) (define-g-object-class "GtkTextChildAnchor" text-child-anchor (:superclass g-object :export t :interfaces nil @@ -3344,7 +3342,14 @@ :type-initializer "gtk_text_mark_get_type") ((left-gravity text-mark-left-gravity "left-gravity" "gboolean" t nil) - (name text-mark-name "name" "gchararray" t nil))) + (name text-mark-name "name" "gchararray" t nil) + (:cffi visible text-mark-visible :boolean + "gtk_text_mark_get_visible" + "gtk_text_mark_set_visible") + (:cffi deleted text-mark-deleted :boolean + "gtk_text_mark_get_deleted" nil) + (:cffi buffer text-mark-buffer (g-object text-buffer) + "gtk_text_mark_get_buffer" nil))) (define-g-object-class "GtkTextTag" text-tag (:superclass g-object :export t :interfaces nil diff --git a/gtk/gtk.text.lisp b/gtk/gtk.text.lisp index a246869..2385066 100644 --- a/gtk/gtk.text.lisp +++ b/gtk/gtk.text.lisp @@ -31,7 +31,6 @@ (define-boxed-opaque-accessor text-iter text-iter-language :reader "gtk_text_iter_get_language" :type :pointer) (define-boxed-opaque-accessor text-iter text-iter-is-end :reader "gtk_text_iter_is_end" :type :boolean) (define-boxed-opaque-accessor text-iter text-iter-is-start :reader "gtk_text_iter_is_start" :type :boolean) -(define-boxed-opaque-accessor text-iter text-iter-can-insert :reader "gtk_text_iter_can_insert" :type :boolean) (define-boxed-opaque-accessor text-iter text-iter-starts-word :reader "gtk_text_iter_starts_word" :type :boolean) (define-boxed-opaque-accessor text-iter text-iter-ends-word :reader "gtk_text_iter_ends_word" :type :boolean) (define-boxed-opaque-accessor text-iter text-iter-inside-word :reader "gtk_text_iter_inside_word" :type :boolean) @@ -78,25 +77,25 @@ (with-foreign-object (iter '%text-iter) (gtk-text-iter-copy iter))) -(defcfun (text-iter-slice "gtk_text_iter_get_slice") (:string :free-from-foreign t) +(defcfun (text-iter-slice "gtk_text_iter_get_slice") (g-string :free-from-foreign t) (start (g-boxed-foreign text-iter)) (end (g-boxed-foreign text-iter))) (export 'text-iter-slice) -(defcfun (text-iter-text "gtk_text_iter_get_text") (:string :free-from-foreign t) +(defcfun (text-iter-text "gtk_text_iter_get_text") (g-string :free-from-foreign t) (start (g-boxed-foreign text-iter)) (end (g-boxed-foreign text-iter))) (export 'text-iter-text) -(defcfun (text-iter-visible-slice "gtk_text_iter_get_visible_slice") (:string :free-from-foreign t) +(defcfun (text-iter-visible-slice "gtk_text_iter_get_visible_slice") (g-string :free-from-foreign t) (start (g-boxed-foreign text-iter)) (end (g-boxed-foreign text-iter))) (export 'text-iter-visible-slice) -(defcfun (text-iter-visible-text "gtk_text_iter_get_visible_text") (:string :free-from-foreign t) +(defcfun (text-iter-visible-text "gtk_text_iter_get_visible_text") (g-string :free-from-foreign t) (start (g-boxed-foreign text-iter)) (end (g-boxed-foreign text-iter))) @@ -138,6 +137,12 @@ (export 'text-iter-editable) +(defcfun (text-iter-can-insert "gtk_text_iter_can_insert") :boolean + (iter (g-boxed-foreign text-iter)) + (default-editable :boolean)) + +(export 'text-iter-can-insert) + (defcfun gtk-text-iter-get-attributes :boolean (iter (g-boxed-foreign text-iter)) (values (g-object text-attributes))) @@ -313,30 +318,6 @@ (export 'text-iter-order) -;; text mark - -(defcfun (text-mark-visible "gtk_text_mark_get_visible") :boolean - (mark (g-object text-mark))) - -(defcfun gtk-text-mark-set-visible :void - (mark (g-object text-mark)) - (visible :boolean)) - -(defun (setf text-mark-visible) (new-value mark) - (gtk-text-mark-set-visible mark new-value)) - -(export 'text-mark-visible) - -(defcfun (text-mark-deleted "gtk_text_mark_get_deleted") :boolean - (mark (g-object text-mark))) - -(export 'text-mark-deleted) - -(defcfun (text-mark-buffer "gtk_text_mark_get_buffer") (g-object text-buffer) - (mark (g-object text-mark))) - -(export 'text-mark-buffer) - ;; text buffer (defcfun (text-buffer-line-count "gtk_text_buffer_get_line_count") :int @@ -534,8 +515,7 @@ (export 'text-buffer-insertion-mark) (defcfun (text-buffer-selection-bound "gtk_text_buffer_get_selection_bound") (g-object text-mark) - (buffer (g-object text-buffer)) - (name (:string :free-to-foreign t))) + (buffer (g-object text-buffer))) (export 'text-buffer-selection-bound) @@ -722,7 +702,8 @@ (defcfun (text-buffer-cut-clipboard "gtk_text_buffer_cut_clipboard") :void (buffer (g-object text-buffer)) - (clipboard (g-object clipboard))) + (clipboard (g-object clipboard)) + (default-editable :boolean)) (export 'text-buffer-cut-clipboard)