From: Evan Nemerson Date: Tue, 2 Nov 2010 20:13:15 +0000 (-0700) Subject: gtk+-2.0, gtk+-3.0: fix CellRenderer.get_fixed_size arguments X-Git-Tag: 0.11.2~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=262f521e9f19ef6b66ff6f5da24bb4d75485c76f;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: fix CellRenderer.get_fixed_size arguments --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 21c279833..ddb4a1ee2 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -821,7 +821,7 @@ 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 void get_alignment (float xalign, float yalign); - public void get_fixed_size (int width, int height); + public void get_fixed_size (out int width, out int height); public void get_padding (int xpad, 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); @@ -1392,9 +1392,9 @@ namespace Gtk { } [CCode (cheader_filename = "gtk/gtk.h")] public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable { - public weak Gtk.HButtonBox action_area; + public Gtk.HButtonBox action_area; public weak Gtk.Widget separator; - public weak Gtk.VBox vbox; + public Gtk.VBox vbox; [CCode (type = "GtkWidget*", has_construct_function = false)] public Dialog (); public void add_action_widget (Gtk.Widget child, int response_id); @@ -6245,7 +6245,7 @@ namespace Gtk { public weak string accelerator; public weak string tooltip; [CCode (type = "GCallback")] - public weak Gtk.ActionCallback callback; + public Gtk.ActionCallback callback; } [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")] public struct Allocation { @@ -6420,7 +6420,7 @@ namespace Gtk { public weak string accelerator; public weak string tooltip; [CCode (type = "GCallback")] - public weak Gtk.ActionCallback callback; + public Gtk.ActionCallback callback; public bool is_active; } [CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")] diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 33811ade1..e1593d764 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -780,7 +780,7 @@ 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 void get_alignment (float xalign, float yalign); - public void get_fixed_size (int width, int height); + public void get_fixed_size (out int width, out int height); public void get_padding (int xpad, int ypad); public virtual void get_preferred_height (Gtk.Widget widget, int minimum_size, int natural_size); public virtual void get_preferred_height_for_width (Gtk.Widget widget, int width, int minimum_height, int natural_height); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index a32211bcc..c05c38661 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -106,6 +106,8 @@ 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_fixed_size.width is_out="1" +gtk_cell_renderer_get_fixed_size.height 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 f9ade2a96..48d223a12 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -107,6 +107,8 @@ 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_fixed_size.width is_out="1" +gtk_cell_renderer_get_fixed_size.height 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"