From: Jürg Billeter Date: Mon, 16 May 2011 10:54:53 +0000 (+0200) Subject: gtk+-3.0: Fix gtk_*_get_preferred_* bindings X-Git-Tag: 0.12.1~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79825bcc6d45c40012bc8da29664f625e20a279b;p=thirdparty%2Fvala.git gtk+-3.0: Fix gtk_*_get_preferred_* bindings Fixes bug 650295. --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index df5444707..19c18d56c 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -859,10 +859,10 @@ namespace Gtk { public unowned Gtk.CellRenderer get_focus_cell (); public unowned Gtk.CellRenderer get_focus_from_sibling (Gtk.CellRenderer renderer); public unowned GLib.List get_focus_siblings (Gtk.CellRenderer renderer); - public virtual void get_preferred_height (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_height, int natural_height); - public virtual void get_preferred_height_for_width (Gtk.CellAreaContext context, Gtk.Widget widget, int width, int minimum_height, int natural_height); - public virtual void get_preferred_width (Gtk.CellAreaContext context, Gtk.Widget widget, int minimum_width, int natural_width); - public virtual void get_preferred_width_for_height (Gtk.CellAreaContext context, Gtk.Widget widget, int height, int minimum_width, int natural_width); + public virtual void get_preferred_height (Gtk.CellAreaContext context, Gtk.Widget widget, out int minimum_height, out int natural_height); + public virtual void get_preferred_height_for_width (Gtk.CellAreaContext context, Gtk.Widget widget, int width, out int minimum_height, out int natural_height); + public virtual void get_preferred_width (Gtk.CellAreaContext context, Gtk.Widget widget, out int minimum_width, out int natural_width); + public virtual void get_preferred_width_for_height (Gtk.CellAreaContext context, Gtk.Widget widget, int height, out int minimum_width, out int natural_width); public virtual Gtk.SizeRequestMode get_request_mode (); public bool has_renderer (Gtk.CellRenderer renderer); public void inner_cell_area (Gtk.Widget widget, Gdk.Rectangle cell_area, Gdk.Rectangle inner_area); @@ -904,10 +904,10 @@ namespace Gtk { public virtual void allocate (int width, int height); public void get_allocation (int width, int height); public unowned Gtk.CellArea get_area (); - public void get_preferred_height (int minimum_height, int natural_height); - public virtual void get_preferred_height_for_width (int width, int minimum_height, int natural_height); - public void get_preferred_width (int minimum_width, int natural_width); - public virtual void get_preferred_width_for_height (int height, int minimum_width, int natural_width); + public void get_preferred_height (out int minimum_height, out int natural_height); + public virtual void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height); + public void get_preferred_width (out int minimum_width, out int natural_width); + public virtual void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width); public void push_preferred_height (int minimum_height, int natural_height); public void push_preferred_width (int minimum_width, int natural_width); public virtual void reset (); @@ -5274,7 +5274,7 @@ namespace Gtk { public virtual void get_preferred_height (out int minimum_height, out int natural_height); public virtual void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height); public void get_preferred_size (out Gtk.Requisition minimum_size, out Gtk.Requisition natural_size); - public virtual void get_preferred_width (out int minimum_width, int natural_width); + public virtual void get_preferred_width (out int minimum_width, out int natural_width); public virtual void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width); public bool get_realized (); public bool get_receives_default (); diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 6109d4bfb..0ea2df35f 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -103,6 +103,22 @@ GtkCell.u hidden="1" GtkCellArea::apply_attributes has_emitter="1" gtk_cell_area_box_pack_start hidden="1" gtk_cell_area_box_pack_end hidden="1" +gtk_cell_area_get_preferred_height.minimum_height is_out="1" +gtk_cell_area_get_preferred_height.natural_height is_out="1" +gtk_cell_area_get_preferred_height_for_width.minimum_height is_out="1" +gtk_cell_area_get_preferred_height_for_width.natural_height is_out="1" +gtk_cell_area_get_preferred_width.minimum_width is_out="1" +gtk_cell_area_get_preferred_width.natural_width is_out="1" +gtk_cell_area_get_preferred_width_for_height.minimum_width is_out="1" +gtk_cell_area_get_preferred_width_for_height.natural_width is_out="1" +gtk_cell_area_context_get_preferred_height.minimum_height is_out="1" +gtk_cell_area_context_get_preferred_height.natural_height is_out="1" +gtk_cell_area_context_get_preferred_height_for_width.minimum_height is_out="1" +gtk_cell_area_context_get_preferred_height_for_width.natural_height is_out="1" +gtk_cell_area_context_get_preferred_width.minimum_width is_out="1" +gtk_cell_area_context_get_preferred_width.natural_width is_out="1" +gtk_cell_area_context_get_preferred_width_for_height.minimum_width is_out="1" +gtk_cell_area_context_get_preferred_width_for_height.natural_width is_out="1" GtkCellEditable::editing_done has_emitter="1" GtkCellEditable::remove_widget has_emitter="1" gtk_cell_layout_get_cells transfer_ownership="1" type_arguments="unowned CellRenderer" @@ -930,7 +946,7 @@ gtk_widget_get_preferred_height_for_width.natural_height is_out="1" gtk_widget_get_preferred_size.minimum_size is_out="1" gtk_widget_get_preferred_size.natural_size is_out="1" gtk_widget_get_preferred_width.minimum_width is_out="1" -gtk_widget_get_preferred_width.natural_height is_out="1" +gtk_widget_get_preferred_width.natural_width is_out="1" gtk_widget_get_preferred_width_for_height.minimum_width is_out="1" gtk_widget_get_preferred_width_for_height.natural_width is_out="1" gtk_widget_new hidden="1"