From: Luca Bruno Date: Mon, 27 Jun 2011 21:22:56 +0000 (+0200) Subject: gtk+-2.0, gtk+-3.0: Fix CellRenderer.get_alignment and get_padding bindings X-Git-Tag: 0.13.1~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186d8f63d8e11975b334e26e13f8924e4e16454b;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: Fix CellRenderer.get_alignment and get_padding bindings Based on patch by Alexander Larsson. Fixes bug 653527. --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 110b19b7b..64eee57fd 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -820,9 +820,9 @@ namespace Gtk { [CCode (has_construct_function = false)] protected CellRenderer (); public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags); - public void get_alignment (float xalign, float yalign); + public void get_alignment (out float xalign, out float yalign); public void get_fixed_size (out int width, out int height); - public void get_padding (int xpad, int ypad); + public void get_padding (out int xpad, out int ypad); public bool get_sensitive (); public abstract void get_size (Gtk.Widget widget, Gdk.Rectangle? cell_area, out int x_offset, out int y_offset, out int width, out int height); public bool get_visible (); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 93f83c07a..d2f1d1080 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -916,9 +916,9 @@ namespace Gtk { protected CellRenderer (); public virtual bool activate (Gdk.Event event, Gtk.Widget widget, string path, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gtk.CellRendererState flags); public virtual void get_aligned_area (Gtk.Widget widget, Gtk.CellRendererState flags, Gdk.Rectangle cell_area, Gdk.Rectangle aligned_area); - public void get_alignment (float xalign, float yalign); + public void get_alignment (out float xalign, out float yalign); public void get_fixed_size (out int width, out int height); - public void get_padding (int xpad, int ypad); + public void get_padding (out int xpad, out int ypad); public virtual void get_preferred_height (Gtk.Widget widget, out int minimum_size, out int natural_size); public virtual void get_preferred_height_for_width (Gtk.Widget widget, int width, out int minimum_height, out int natural_height); public void get_preferred_size (Gtk.Widget widget, out Gtk.Requisition minimum_size, out Gtk.Requisition natural_size); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 396bb8a58..652af5852 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -106,8 +106,12 @@ gtk_cell_layout_set_attributes ellipsis="1" gtk_cell_layout_set_cell_data_func.func transfer_ownership="1" gtk_cell_layout_set_cell_data_func.func_data hidden="1" gtk_cell_layout_set_cell_data_func.destroy hidden="1" +gtk_cell_renderer_get_alignment.xalign is_out="1" +gtk_cell_renderer_get_alignment.yalign is_out="1" gtk_cell_renderer_get_fixed_size.width is_out="1" gtk_cell_renderer_get_fixed_size.height is_out="1" +gtk_cell_renderer_get_padding.xpad is_out="1" +gtk_cell_renderer_get_padding.ypad is_out="1" gtk_cell_renderer_get_size abstract="1" gtk_cell_renderer_get_size.cell_area nullable="1" gtk_cell_renderer_get_size.x_offset 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 1bfcf9cda..f747c4f6d 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -129,8 +129,12 @@ gtk_cell_layout_set_attributes ellipsis="1" gtk_cell_layout_set_cell_data_func.func transfer_ownership="1" gtk_cell_layout_set_cell_data_func.func_data hidden="1" gtk_cell_layout_set_cell_data_func.destroy hidden="1" +gtk_cell_renderer_get_alignment.xalign is_out="1" +gtk_cell_renderer_get_alignment.yalign is_out="1" gtk_cell_renderer_get_fixed_size.width is_out="1" gtk_cell_renderer_get_fixed_size.height is_out="1" +gtk_cell_renderer_get_padding.xpad is_out="1" +gtk_cell_renderer_get_padding.ypad is_out="1" gtk_cell_renderer_get_preferred_height.minimum_size is_out="1" gtk_cell_renderer_get_preferred_height.natural_size is_out="1" gtk_cell_renderer_get_preferred_height_for_width.minimum_height is_out="1"