From: Marc-André Lureau Date: Fri, 28 Oct 2011 15:01:27 +0000 (+0200) Subject: gtk+-3.0: Several fixes in the bindings X-Git-Tag: 0.14.1~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42fc97993e79f0089dde97bd42a81ffb6be069e3;p=thirdparty%2Fvala.git gtk+-3.0: Several fixes in the bindings Fixes bug 662940. --- diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 8e80cd52a..bc274f1a3 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -921,7 +921,7 @@ 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 virtual void get_aligned_area (Gtk.Widget widget, Gtk.CellRendererState flags, Gdk.Rectangle cell_area, Gdk.Rectangle aligned_area); + public virtual Gdk.Rectangle get_aligned_area (Gtk.Widget widget, Gtk.CellRendererState flags, Gdk.Rectangle cell_area); 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 (out int xpad, out int ypad); @@ -2768,8 +2768,8 @@ namespace Gtk { public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false)] protected Misc (); - public void get_alignment (float xalign, float yalign); - public void get_padding (int xpad, int ypad); + public void get_alignment (out float xalign, out float yalign); + public void get_padding (out int xpad, out int ypad); public void set_alignment (float xalign, float yalign); public void set_padding (int xpad, int ypad); [NoAccessorMethod] @@ -2798,7 +2798,7 @@ namespace Gtk { public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false, type = "GtkWidget*")] public Notebook (); - public int append_page (Gtk.Widget child, Gtk.Widget? tab_label); + public int append_page (Gtk.Widget child, Gtk.Widget? tab_label = null); public int append_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label); public unowned Gtk.Widget get_action_widget (Gtk.PackType pack_type); public int get_current_page (); @@ -2824,7 +2824,7 @@ namespace Gtk { public int page_num (Gtk.Widget child); public void popup_disable (); public void popup_enable (); - public int prepend_page (Gtk.Widget child, Gtk.Widget? tab_label); + public int prepend_page (Gtk.Widget child, Gtk.Widget? tab_label = null); public int prepend_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label); public void prev_page (); public void remove_page (int page_num); @@ -5455,11 +5455,11 @@ namespace Gtk { public void modify_font (Pango.FontDescription? font_desc); public void modify_style (Gtk.RcStyle style); public void modify_text (Gtk.StateType state, Gdk.Color? color); - public void override_background_color (Gtk.StateFlags state, Gdk.RGBA color); - public void override_color (Gtk.StateFlags state, Gdk.RGBA color); - public void override_cursor (Gdk.RGBA cursor, Gdk.RGBA secondary_cursor); - public void override_font (Pango.FontDescription font_desc); - public void override_symbolic_color (string name, Gdk.RGBA color); + public void override_background_color (Gtk.StateFlags state, Gdk.RGBA? color); + public void override_color (Gtk.StateFlags state, Gdk.RGBA? color); + public void override_cursor (Gdk.RGBA? cursor, Gdk.RGBA? secondary_cursor); + public void override_font (Pango.FontDescription? font_desc); + public void override_symbolic_color (string name, Gdk.RGBA? color); public void path (out uint path_length, out unowned string path, out unowned string path_reversed); public static void pop_composite_child (); public static void push_composite_child (); diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index e4d4667da..901980224 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -129,6 +129,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_aligned_area type_name="Gdk.Rectangle" +gtk_cell_renderer_get_aligned_area.aligned_area 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" @@ -397,13 +399,17 @@ gtk_message_dialog_new_with_markup ellipsis="1" printf_format="1" gtk_message_dialog_new_with_markup.parent nullable="1" gtk_message_dialog_format_secondary_markup ellipsis="1" printf_format="1" gtk_message_dialog_format_secondary_text ellipsis="1" printf_format="1" +gtk_misc_get_alignment.xalign is_out="1" +gtk_misc_get_alignment.yalign is_out="1" +gtk_misc_get_padding.xpad is_out="1" +gtk_misc_get_padding.ypad is_out="1" gtk_mount_operation_is_showing hidden="1" gtk_mount_operation_new.parent nullable="1" GtkNotebook.focus_tab hidden="1" -gtk_notebook_append_page.tab_label nullable="1" +gtk_notebook_append_page.tab_label nullable="1" default_value="null" gtk_notebook_append_page_menu.tab_label nullable="1" gtk_notebook_append_page_menu.menu_label nullable="1" -gtk_notebook_prepend_page.tab_label nullable="1" +gtk_notebook_prepend_page.tab_label nullable="1" default_value="null" gtk_notebook_prepend_page_menu.tab_label nullable="1" gtk_notebook_prepend_page_menu.menu_label nullable="1" gtk_notebook_set_window_creation_hook.func transfer_ownership="1" @@ -964,6 +970,12 @@ gtk_widget_modify_cursor.secondary nullable="1" gtk_widget_modify_fg.color nullable="1" gtk_widget_modify_font.font_desc nullable="1" gtk_widget_modify_text.color nullable="1" +gtk_widget_override_background_color.color nullable="1" +gtk_widget_override_color.color nullable="1" +gtk_widget_override_cursor.cursor nullable="1" +gtk_widget_override_cursor.secondary_cursor nullable="1" +gtk_widget_override_font.font_desc nullable="1" +gtk_widget_override_symbolic_color.color nullable="1" gtk_widget_path.path_length is_out="1" gtk_widget_path.path is_out="1" gtk_widget_path.path_reversed is_out="1"