[vala/wip/gtkgir] WIP



commit d44b473292316ed49f89eae406bc571f6f3b59bb
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue May 31 16:42:59 2016 +0200

    WIP

 vapi/gtk+-3.0.vapi                |   70 +++++++++++++++++++------------------
 vapi/metadata/Gtk-3.0-custom.vala |   13 -------
 vapi/metadata/Gtk-3.0.metadata    |    2 +
 3 files changed, 38 insertions(+), 47 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 2e781ff..1fe9cf1 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -6117,20 +6117,20 @@ namespace Gtk {
        }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_rc_style_get_type ()")]
        public class RcStyle : GLib.Object {
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gdk.Color[] @base;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gdk.Color[] bg;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak string[] bg_pixmap_name;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gtk.RcFlags[] color_flags;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gdk.Color[] fg;
+               [CCode (array_length = false)]
+               public weak Gdk.Color @base[5];
+               [CCode (array_length = false)]
+               public weak Gdk.Color bg[5];
+               [CCode (array_length = false)]
+               public weak string bg_pixmap_name[5];
+               [CCode (array_length = false)]
+               public weak Gtk.RcFlags color_flags[5];
+               [CCode (array_length = false)]
+               public weak Gdk.Color fg[5];
                public weak Pango.FontDescription font_desc;
                public weak string name;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Gdk.Color[] text;
+               [CCode (array_length = false)]
+               public weak Gdk.Color text[5];
                public int xthickness;
                public int ythickness;
                [CCode (has_construct_function = false)]
@@ -7206,26 +7206,26 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_style_get_type ()")]
        [Version (deprecated = true, deprecated_since = "3.0", replacement = "StyleContext")]
        public class Style : GLib.Object {
-               [CCode (array_length = false, array_null_terminated = true)]
-               public weak Cairo.Pattern[] background;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] @base;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] bg;
+               [CCode (array_length = false)]
+               public weak Cairo.Pattern background[5];
+               [CCode (array_length = false)]
+               public Gdk.Color @base[5];
+               [CCode (array_length = false)]
+               public Gdk.Color bg[5];
                public Gdk.Color black;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] dark;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] fg;
+               [CCode (array_length = false)]
+               public Gdk.Color dark[5];
+               [CCode (array_length = false)]
+               public Gdk.Color fg[5];
                public weak Pango.FontDescription font_desc;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] light;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] mid;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] text;
-               [CCode (array_length = false, array_null_terminated = true)]
-               public Gdk.Color[] text_aa;
+               [CCode (array_length = false)]
+               public Gdk.Color light[5];
+               [CCode (array_length = false)]
+               public Gdk.Color mid[5];
+               [CCode (array_length = false)]
+               public Gdk.Color text[5];
+               [CCode (array_length = false)]
+               public Gdk.Color text_aa[5];
                public Gdk.Color white;
                public int xthickness;
                public int ythickness;
@@ -7629,6 +7629,7 @@ namespace Gtk {
                public Gtk.TextDirection direction;
                public uint editable;
                public weak Pango.FontDescription font;
+               public weak string font_features;
                public double font_scale;
                public int indent;
                public uint invisible;
@@ -10785,7 +10786,7 @@ namespace Gtk {
                public string mime_type;
                public string app_name;
                public string app_exec;
-               [CCode (array_length = false, array_null_terminated = true)]
+               [CCode (array_length = false)]
                public string[] groups;
                public bool is_private;
        }
@@ -10795,9 +10796,9 @@ namespace Gtk {
                public weak string? uri;
                public weak string? display_name;
                public weak string? mime_type;
-               [CCode (array_length = false, array_null_terminated = true)]
+               [CCode (array_length = false)]
                public weak string[]? applications;
-               [CCode (array_length = false, array_null_terminated = true)]
+               [CCode (array_length = false)]
                public weak string[]? groups;
                public int age;
        }
@@ -10853,7 +10854,8 @@ namespace Gtk {
                public uint draw_bg;
                public uint inside_selection;
                public uint is_text;
-               public Gdk.RGBA? rgba[2];
+               [CCode (array_length = false)]
+               public weak Gdk.RGBA rgba[2];
        }
        [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_iter_get_type ()")]
        public struct TextIter {
diff --git a/vapi/metadata/Gtk-3.0-custom.vala b/vapi/metadata/Gtk-3.0-custom.vala
index adb919d..fb5efee 100644
--- a/vapi/metadata/Gtk-3.0-custom.vala
+++ b/vapi/metadata/Gtk-3.0-custom.vala
@@ -87,19 +87,6 @@ namespace Gtk {
                public bool is_active;
        }
 
-       [CCode (has_type_id = false)]
-       public struct TextAppearance {
-               public Gdk.Color bg_color;
-               public Gdk.Color fg_color;
-               public int rise;
-               public uint underline;
-               public uint strikethrough;
-               public uint draw_bg;
-               public uint inside_selection;
-               public uint is_text;
-               public Gdk.RGBA? rgba[2];
-       }
-
        [CCode (type_id = "gtk_tree_model_get_type ()")]
        public interface TreeModel : GLib.Object {
                [HasEmitter]
diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index d45703a..dd2ebf1 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -310,6 +310,8 @@ RecentData
   .* unowned=false
 TextAttributes
   .language unowned=false
+TextAppearance
+  .rgba unowned=false
 
 // Bug #: Nullable properties & fields
 ComboBox.active_id nullable


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]