gtk+-3.0: Fix GtkBorder, gtk_icon_info_*, gtk_style_context_* bindings

Fixes bug 649495.

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index df544470783d795625ba5e8e8bf973bd100d0ba6..11113791d44efc50e6aeee542f8b8d51f47758b7 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -672,17 +672,6 @@ namespace Gtk {
                public weak Gtk.BindingSignal next;
                public weak string signal_name;
        }
-       [Compact]
-       [CCode (copy_function = "gtk_border_copy", type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
-       public class Border {
-               public int16 bottom;
-               public int16 left;
-               public int16 right;
-               public int16 top;
-               [CCode (has_construct_function = false)]
-               public Border ();
-               public Gtk.Border copy ();
-       }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1580,7 +1569,7 @@ namespace Gtk {
                public Gtk.ImageType get_icon_storage_type (Gtk.EntryIconPosition icon_pos);
                public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos);
                public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos);
-               public unowned Gtk.Border get_inner_border ();
+               public unowned Gtk.Border? get_inner_border ();
                public unichar get_invisible_char ();
                public unowned Pango.Layout get_layout ();
                public void get_layout_offsets (out int x, out int y);
@@ -2108,8 +2097,8 @@ namespace Gtk {
                public bool get_embedded_rect (out Gdk.Rectangle rectangle);
                public unowned string get_filename ();
                public Gdk.Pixbuf load_icon () throws GLib.Error;
-               public unowned Gdk.Pixbuf load_symbolic (Gdk.RGBA fg, Gdk.RGBA success_color, Gdk.RGBA warning_color, Gdk.RGBA error_color, bool was_symbolic) throws GLib.Error;
-               public unowned Gdk.Pixbuf load_symbolic_for_context (Gtk.StyleContext context, bool was_symbolic) throws GLib.Error;
+               public Gdk.Pixbuf load_symbolic (Gdk.RGBA fg, Gdk.RGBA? success_color = null, Gdk.RGBA? warning_color = null, Gdk.RGBA? error_color = null, out bool was_symbolic = null) throws GLib.Error;
+               public Gdk.Pixbuf load_symbolic_for_context (Gtk.StyleContext context, out bool was_symbolic = null) throws GLib.Error;
                public void set_raw_coordinates (bool raw_coordinates);
        }
        [Compact]
@@ -3944,15 +3933,15 @@ namespace Gtk {
                public void add_region (string region_name, Gtk.RegionFlags flags);
                public void cancel_animations (void* region_id);
                public void @get (Gtk.StateFlags state);
-               public void get_background_color (Gtk.StateFlags state, Gdk.RGBA color);
-               public void get_border (Gtk.StateFlags state, Gtk.Border border);
-               public void get_border_color (Gtk.StateFlags state, Gdk.RGBA color);
-               public void get_color (Gtk.StateFlags state, Gdk.RGBA color);
+               public Gdk.RGBA get_background_color (Gtk.StateFlags state);
+               public Gtk.Border get_border (Gtk.StateFlags state);
+               public Gdk.RGBA get_border_color (Gtk.StateFlags state);
+               public Gdk.RGBA get_color (Gtk.StateFlags state);
                public Gtk.TextDirection get_direction ();
                public unowned Pango.FontDescription get_font (Gtk.StateFlags state);
                public Gtk.JunctionSides get_junction_sides ();
-               public void get_margin (Gtk.StateFlags state, Gtk.Border margin);
-               public void get_padding (Gtk.StateFlags state, Gtk.Border padding);
+               public Gtk.Border get_margin (Gtk.StateFlags state);
+               public Gtk.Border get_padding (Gtk.StateFlags state);
                public unowned Gtk.WidgetPath get_path ();
                public void get_property (string property, Gtk.StateFlags state, GLib.Value value);
                public unowned Gdk.Screen get_screen ();
@@ -5537,7 +5526,7 @@ namespace Gtk {
        public class WidgetAuxInfo {
                public uint halign;
                public int height;
-               public weak Gtk.Border margin;
+               public Gtk.Border margin;
                public uint valign;
                public int width;
        }
@@ -6073,6 +6062,13 @@ namespace Gtk {
                public int width;
                public int height;
        }
+       [CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
+       public struct Border {
+               public int16 left;
+               public int16 right;
+               public int16 top;
+               public int16 bottom;
+       }
        [CCode (type_id = "GTK_TYPE_IM_CONTEXT_INFO", cheader_filename = "gtk/gtk.h")]
        public struct IMContextInfo {
                public weak string context_id;

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 6109d4bfbcd836621b21f3bbe4008c6b49d8294a..49d461854ff783bfd3a575b58ddee86950dda0ec 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -61,7 +61,10 @@ gtk_binding_entry_add_signall.binding_args type_arguments="BindingArg"
 GtkBindingSet.class_branch_pspecs hidden="1"
 GtkBindingSet.widget_class_pspecs hidden="1"
 GtkBindingSet.widget_path_pspecs hidden="1"
-gtk_border_copy transfer_ownership="1"
+GtkBorder is_value_type="1"
+gtk_border_copy hidden="1"
+gtk_border_free hidden="1"
+gtk_border_new hidden="1"
 GtkBox.children type_arguments="Widget"
 gtk_box_pack_start.expand default_value="true"
 gtk_box_pack_start.fill default_value="true"
@@ -199,6 +202,7 @@ gtk_entry_completion.func_notify hidden="1"
 gtk_entry_completion_set_match_func.func transfer_ownership="1"
 gtk_entry_completion_set_match_func.func_data hidden="1"
 gtk_entry_completion_set_match_func.func_notify hidden="1"
+gtk_entry_get_inner_border nullable="1"
 gtk_entry_get_layout_offsets.x is_out="1"
 gtk_entry_get_layout_offsets.y is_out="1"
 gtk_entry_set_icon_from_pixbuf.pixbuf nullable="1"
@@ -240,6 +244,13 @@ gtk_hscrollbar_new.adjustment nullable="1"
 gtk_icon_info_copy transfer_ownership="1"
 gtk_icon_info_get_embedded_rect.rectangle is_out="1"
 gtk_icon_info_load_icon transfer_ownership="1"
+gtk_icon_info_load_symbolic transfer_ownership="1"
+gtk_icon_info_load_symbolic.success_color nullable="1" default_value="null"
+gtk_icon_info_load_symbolic.warning_color nullable="1" default_value="null"
+gtk_icon_info_load_symbolic.error_color nullable="1" default_value="null"
+gtk_icon_info_load_symbolic.was_symbolic is_out="1" default_value="null"
+gtk_icon_info_load_symbolic_for_context transfer_ownership="1"
+gtk_icon_info_load_symbolic_for_context.was_symbolic is_out="1" default_value="null"
 gtk_icon_view_get_cursor.path transfer_ownership="1"
 gtk_icon_view_get_tooltip_context.iter is_out="1"
 gtk_icon_view_get_tooltip_context.x is_out="1"
@@ -569,6 +580,18 @@ GtkStyle.base_gc weak="0"
 GtkStyle.text_aa_gc weak="0"
 GtkStyle.bg_pixmap weak="0"
 gtk_style_copy type_name="Style" transfer_ownership="1"
+gtk_style_context_get_background_color type_name="Gdk.RGBA"
+gtk_style_context_get_background_color.color hidden="1"
+gtk_style_context_get_border type_name="Gtk.Border"
+gtk_style_context_get_border.border hidden="1"
+gtk_style_context_get_border_color type_name="Gdk.RGBA"
+gtk_style_context_get_border_color.color hidden="1"
+gtk_style_context_get_color type_name="Gdk.RGBA"
+gtk_style_context_get_color.color hidden="1"
+gtk_style_context_get_margin type_name="Gtk.Border"
+gtk_style_context_get_margin.margin hidden="1"
+gtk_style_context_get_padding type_name="Gtk.Border"
+gtk_style_context_get_padding.padding hidden="1"
 gtk_style_lookup_color.color is_out="1"
 gtk_style_get_style_property.value is_out="1"
 GtkTable:row-spacing accessor_method="0"