From: Jürg Billeter Date: Fri, 9 Dec 2011 12:02:27 +0000 (+0100) Subject: gtk+-3.0: Fix gtk_widgets_compute_expand bindings X-Git-Tag: 0.14.2~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252dd03e4724d506accce52d19fa0b3eef1f3b35;p=thirdparty%2Fvala.git gtk+-3.0: Fix gtk_widgets_compute_expand bindings Based on patch by Alexander Larsson. Fixes bug 665860. --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index aa328f0ae..5406c9fa4 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -5378,7 +5378,9 @@ namespace Gtk { public virtual void adjust_size_request (Gtk.Orientation orientation, ref int minimum_size, ref int natural_size); public bool child_focus (Gtk.DirectionType direction); public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed); - public virtual void compute_expand (Gtk.Orientation orientation); + public virtual bool compute_expand (Gtk.Orientation orientation); + [CCode (vfunc_name = "compute_expand")] + public virtual void compute_expand_internal (out bool hexpand, out bool vexpand); public Pango.Context create_pango_context (); public Pango.Layout create_pango_layout (string? text); public void destroyed (out unowned Gtk.Widget widget_pointer); diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala index 2aaa62039..dba41c465 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala +++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala @@ -63,6 +63,8 @@ namespace Gtk { [CCode (has_new_function = false, construct_function = "gtk_widget_new")] public extern Widget (...); public class uint activate_signal; + [CCode (vfunc_name = "compute_expand")] + public virtual void compute_expand_internal (out bool hexpand, out bool vexpand); } public interface Editable { diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index e7724bdbf..db32c6fca 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -948,6 +948,7 @@ GtkWidget:can-focus accessor_method="0" gtk_widget_class_path.path_length is_out="1" gtk_widget_class_path.path is_out="1" gtk_widget_class_path.path_reversed is_out="1" +gtk_widget_compute_expand type_name="bool" gtk_widget_create_pango_context transfer_ownership="1" gtk_widget_create_pango_layout transfer_ownership="1" gtk_widget_create_pango_layout.text nullable="1"