gtk+-2.0, gtk+-3.0: Make Gtk.Border a compact class, not a struct.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index a992c0fd184045cde2e06b18c8f8e8cc13cee120..aafd6e5304c5c9bb7b1e3ebe6391ff1e89fa7672 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -396,6 +396,17 @@ 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 int bottom;
+               public int left;
+               public int right;
+               public int 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 {
                public weak GLib.List<Gtk.Widget> children;
@@ -1229,7 +1240,7 @@ namespace Gtk {
                public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos);
                public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos);
                public unowned Gdk.Window get_icon_window (Gtk.EntryIconPosition icon_pos);
-               public 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 (int x, int y);
@@ -5973,17 +5984,6 @@ namespace Gtk {
                public int width;
                public int height;
        }
-       [CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
-       public struct Border {
-               public int left;
-               public int right;
-               public int top;
-               public int bottom;
-               [CCode (cname = "gtk_border_new", has_construct_function = false)]
-               public Border ();
-               public Gtk.Border copy ();
-               public void free ();
-       }
        [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/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 2fa693ed3997ddd03e7ab1e83b2808712b0b3990..3165e4e1408fcda288f83984a58982729fd82ba1 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -398,6 +398,17 @@ 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 int bottom;
+               public int left;
+               public int right;
+               public int 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.SizeRequest, Gtk.Orientable {
                [CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -1123,7 +1134,7 @@ namespace Gtk {
                public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos);
                public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos);
                public unowned Gdk.Window get_icon_window (Gtk.EntryIconPosition icon_pos);
-               public 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 (int x, int y);
@@ -5443,17 +5454,6 @@ namespace Gtk {
                public int width;
                public int height;
        }
-       [CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
-       public struct Border {
-               public int left;
-               public int right;
-               public int top;
-               public int bottom;
-               [CCode (cname = "gtk_border_new", has_construct_function = false)]
-               public Border ();
-               public Gtk.Border copy ();
-               public void free ();
-       }
        [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+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index fa359fdc4d4cf374d362867f1f9bbca640db4494..5bb5f07f9ad21194f019335d716d16ee05bf30e4 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -60,7 +60,7 @@ 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"
-GtkBorder is_value_type="1"
+gtk_border_copy transfer_ownership="1"
 GtkBox.children type_arguments="Widget"
 gtk_box_pack_start.expand default_value="true"
 gtk_box_pack_start.fill default_value="true"

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index d4981566e0670d6ad78dd7cb2cdd768fa3cc309c..f535b861961988e859ec375a476eb53380b764d9 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -63,7 +63,7 @@ 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"
-GtkBorder is_value_type="1"
+gtk_border_copy transfer_ownership="1"
 GtkBox.children type_arguments="Widget"
 gtk_box_pack_start.expand default_value="true"
 gtk_box_pack_start.fill default_value="true"