From: Rico Tzschichholz Date: Thu, 22 Mar 2018 15:25:49 +0000 (+0100) Subject: gtk+-*.0: Fix iter parameter of TextView.backward*/forward*/move_visually() X-Git-Tag: 0.38.9~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b87ceb34c5ce390f2b15d2b44b9b414a7c51ef0;p=thirdparty%2Fvala.git gtk+-*.0: Fix iter parameter of TextView.backward*/forward*/move_visually() Those methods are changing the passed iter structure and therefore it needs be marked as ref for vala taking this into account. https://bugzilla.gnome.org/show_bug.cgi?id=794345 --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index f769ae734..1f588084a 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -4722,11 +4722,11 @@ namespace Gtk { public TextView (); public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor); public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos); - public bool backward_display_line (Gtk.TextIter iter); - public bool backward_display_line_start (Gtk.TextIter iter); + public bool backward_display_line (ref Gtk.TextIter iter); + public bool backward_display_line_start (ref Gtk.TextIter iter); public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, out int window_x, out int window_y); - public bool forward_display_line (Gtk.TextIter iter); - public bool forward_display_line_end (Gtk.TextIter iter); + public bool forward_display_line (ref Gtk.TextIter iter); + public bool forward_display_line_end (ref Gtk.TextIter iter); public bool get_accepts_tab (); public int get_border_window_size (Gtk.TextWindowType type); public unowned Gtk.TextBuffer get_buffer (); @@ -4758,7 +4758,7 @@ namespace Gtk { [NoWrapper] public virtual void move_focus (Gtk.DirectionType direction); public bool move_mark_onscreen (Gtk.TextMark mark); - public bool move_visually (Gtk.TextIter iter, int count); + public bool move_visually (ref Gtk.TextIter iter, int count); public bool place_cursor_onscreen (); public void reset_im_context (); public void scroll_mark_onscreen (Gtk.TextMark mark); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 4f4ea63ca..e9c7bf9f6 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -5778,15 +5778,15 @@ namespace Gtk { public TextView (); public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor); public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos); - public bool backward_display_line (Gtk.TextIter iter); - public bool backward_display_line_start (Gtk.TextIter iter); + public bool backward_display_line (ref Gtk.TextIter iter); + public bool backward_display_line_start (ref Gtk.TextIter iter); public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, out int window_x, out int window_y); [NoWrapper] public virtual Gtk.TextBuffer create_buffer (); [NoWrapper] public virtual void draw_layer (Gtk.TextViewLayer layer, Cairo.Context cr); - public bool forward_display_line (Gtk.TextIter iter); - public bool forward_display_line_end (Gtk.TextIter iter); + public bool forward_display_line (ref Gtk.TextIter iter); + public bool forward_display_line_end (ref Gtk.TextIter iter); public bool get_accepts_tab (); public int get_border_window_size (Gtk.TextWindowType type); public int get_bottom_margin (); @@ -5822,7 +5822,7 @@ namespace Gtk { public bool im_context_filter_keypress (Gdk.EventKey event); public void move_child (Gtk.Widget child, int xpos, int ypos); public bool move_mark_onscreen (Gtk.TextMark mark); - public bool move_visually (Gtk.TextIter iter, int count); + public bool move_visually (ref Gtk.TextIter iter, int count); public bool place_cursor_onscreen (); public void reset_cursor_blink (); public void reset_im_context (); diff --git a/vapi/gtk+-4.0.vapi b/vapi/gtk+-4.0.vapi index fad815497..2cd39332f 100644 --- a/vapi/gtk+-4.0.vapi +++ b/vapi/gtk+-4.0.vapi @@ -12991,15 +12991,15 @@ namespace Gtk { public TextView (); public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor); public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos); - public bool backward_display_line (Gtk.TextIter iter); - public bool backward_display_line_start (Gtk.TextIter iter); + public bool backward_display_line (ref Gtk.TextIter iter); + public bool backward_display_line_start (ref Gtk.TextIter iter); public void buffer_to_window_coords (Gtk.TextWindowType win, int buffer_x, int buffer_y, out int window_x, out int window_y); [NoWrapper] public virtual Gtk.TextBuffer create_buffer (); [NoWrapper] public virtual void draw_layer (Gtk.TextViewLayer layer, Cairo.Context cr); - public bool forward_display_line (Gtk.TextIter iter); - public bool forward_display_line_end (Gtk.TextIter iter); + public bool forward_display_line (ref Gtk.TextIter iter); + public bool forward_display_line_end (ref Gtk.TextIter iter); [Version (since = "2.4")] public bool get_accepts_tab (); public int get_border_window_size (Gtk.TextWindowType type); @@ -13040,7 +13040,7 @@ namespace Gtk { public bool im_context_filter_keypress ([CCode (type = "GdkEventKey*")] Gdk.Event event); public void move_child (Gtk.Widget child, int xpos, int ypos); public bool move_mark_onscreen (Gtk.TextMark mark); - public bool move_visually (Gtk.TextIter iter, int count); + public bool move_visually (ref Gtk.TextIter iter, int count); public bool place_cursor_onscreen (); [Version (since = "3.20")] public void reset_cursor_blink (); diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata index 915b4a989..26f8c18ba 100644 --- a/vapi/metadata/Gtk-4.0.metadata +++ b/vapi/metadata/Gtk-4.0.metadata @@ -308,8 +308,11 @@ TextBuffer .insert_text.pos ref .insert_text#signal.location ref TextView + .backward*.iter ref + .forward*.iter ref .get_iter_location return_void .get_visible_rect return_void + .move_visually.iter ref TreePath .free destroys_instance .get_indices skip diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index e0d27d9aa..682ec16cf 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -829,6 +829,10 @@ gtk_text_iter_forward_search.match_start is_out="1" gtk_text_iter_forward_search.match_end is_out="1" gtk_text_iter_forward_search.limit nullable="1" gtk_text_iter_forward_to_tag_toggle.tag nullable="1" +gtk_text_view_backward_display_line.iter is_ref="1" +gtk_text_view_backward_display_line_start.iter is_ref="1" +gtk_text_view_forward_display_line.iter is_ref="1" +gtk_text_view_forward_display_line_end.iter is_ref="1" gtk_text_view_get_cursor_locations.iter nullable="1" gtk_text_view_get_cursor_locations.strong is_out="1" gtk_text_view_get_cursor_locations.weak is_out="1" @@ -843,6 +847,7 @@ gtk_text_view_get_line_yrange.y is_out="1" gtk_text_view_get_line_yrange.height is_out="1" gtk_text_view_get_tabs transfer_ownership="1" gtk_text_view_get_visible_rect.visible_rect is_out="1" +gtk_text_view_move_visually.iter is_ref="1" gtk_text_view_window_to_buffer_coords.buffer_x is_out="1" gtk_text_view_window_to_buffer_coords.buffer_y is_out="1" gtk_text_view_buffer_to_window_coords.window_x is_out="1" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index e9fb74a42..24f2d9649 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -1428,6 +1428,10 @@ gtk_text_iter_forward_search.match_start is_out="1" gtk_text_iter_forward_search.match_end is_out="1" gtk_text_iter_forward_search.limit nullable="1" gtk_text_iter_forward_to_tag_toggle.tag nullable="1" +gtk_text_view_backward_display_line.iter is_ref="1" +gtk_text_view_backward_display_line_start.iter is_ref="1" +gtk_text_view_forward_display_line.iter is_ref="1" +gtk_text_view_forward_display_line_end.iter is_ref="1" gtk_text_view_get_cursor_locations.iter nullable="1" gtk_text_view_get_cursor_locations.strong is_out="1" gtk_text_view_get_cursor_locations.weak is_out="1" @@ -1443,6 +1447,7 @@ gtk_text_view_get_line_yrange.height is_out="1" gtk_text_view_get_tabs transfer_ownership="1" nullable="1" gtk_text_view_get_visible_rect.visible_rect is_out="1" gtk_text_view_get_window nullable="1" +gtk_text_view_move_visually.iter is_ref="1" gtk_text_view_window_to_buffer_coords.buffer_x is_out="1" gtk_text_view_window_to_buffer_coords.buffer_y is_out="1" gtk_text_view_buffer_to_window_coords.window_x is_out="1"