Add PangoScale binding, patch by Evan Nemerson, fixes bug 519922

2008-12-17  Jürg Billeter  <j@bitron.ch>

	* vapi/packages/pango/:

	Add PangoScale binding, patch by Evan Nemerson, fixes bug 519922

	* vapi/pango.vapi: regenerated

svn path=/trunk/; revision=2201

diff --git a/ChangeLog b/ChangeLog
index a2f18fd50e0270bfa96da5d52986aef7b5091fec..e59ae385ac6f98e3e65adac845eae701a5a40679 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-17  Jürg Billeter  <j@bitron.ch>
+
+       * vapi/packages/pango/:
+
+       Add PangoScale binding, patch by Evan Nemerson, fixes bug 519922
+
+       * vapi/pango.vapi: regenerated
+
 2008-12-17  Jürg Billeter  <j@bitron.ch>
 
        * vapi/packages/gtk+-2.0/:

diff --git a/vapi/packages/pango/pango-custom.vala b/vapi/packages/pango/pango-custom.vala
index b7df1ba1371d1fe0d685ec0fbe1e645c6fce41bc..e6775dedc1111591a43d09c3c4c0561bc188d459 100644 (file)
--- a/vapi/packages/pango/pango-custom.vala
+++ b/vapi/packages/pango/pango-custom.vala
@@ -24,4 +24,15 @@ namespace Pango {
        public class Language {
                public extern weak string to_string ();
        }
+
+       [CCode (cprefix = "PANGO_SCALE_", cheader_filename = "pango/pango.h")]
+       public enum Scale {
+               XX_SMALL,
+               X_SMALL,
+               SMALL,
+               MEDIUM,
+               LARGE,
+               X_LARGE,
+               XX_LARGE
+       }
 }

diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 34bf8c276b563da7ade80256b8fe093237f3f785..1d340ba29ba5ffff0e8e9bd4fc04731d03098fd2 100644 (file)
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -169,7 +169,7 @@ namespace Pango {
                public weak Pango.FontDescription describe ();
                public weak Pango.FontDescription describe_with_absolute_size ();
                public static void descriptions_free (Pango.FontDescription[] descs);
-               public weak Pango.EngineShape find_shaper (Pango.Language language, uint ch);
+               public weak Pango.EngineShape find_shaper (Pango.Language language, uint32 ch);
                public weak Pango.Coverage get_coverage (Pango.Language language);
                public weak Pango.FontMap get_font_map ();
                public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
@@ -483,15 +483,15 @@ namespace Pango {
        }
        [CCode (type_id = "PANGO_TYPE_COLOR", cheader_filename = "pango/pango.h")]
        public struct Color {
-               public ushort red;
-               public ushort green;
-               public ushort blue;
+               public uint16 red;
+               public uint16 green;
+               public uint16 blue;
                public Pango.Color copy ();
                public void free ();
                public bool parse (string spec);
                public weak string to_string ();
        }
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (type_id = "PANGO_TYPE_LOG_ATTR", cheader_filename = "pango/pango.h")]
        public struct LogAttr {
                public uint is_line_break;
                public uint is_mandatory_break;
@@ -527,7 +527,7 @@ namespace Pango {
                public void transform_rectangle (ref Pango.Rectangle rect);
                public void translate (double tx, double ty);
        }
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (type_id = "PANGO_TYPE_RECTANGLE", cheader_filename = "pango/pango.h")]
        public struct Rectangle {
                public int x;
                public int y;
@@ -644,6 +644,16 @@ namespace Pango {
                UNDERLINE,
                STRIKETHROUGH
        }
+       [CCode (cprefix = "PANGO_SCALE_", cheader_filename = "pango/pango.h")]
+       public enum Scale {
+               XX_SMALL,
+               X_SMALL,
+               SMALL,
+               MEDIUM,
+               LARGE,
+               X_LARGE,
+               XX_LARGE
+       }
        [CCode (cprefix = "PANGO_SCRIPT_", cheader_filename = "pango/pango.h")]
        public enum Script {
                INVALID_CODE,
@@ -806,13 +816,13 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public const string VERSION_STRING;
        [CCode (cheader_filename = "pango/pango.h")]
-       public static weak Pango.Attribute attr_background_new (ushort red, ushort green, ushort blue);
+       public static weak Pango.Attribute attr_background_new (uint16 red, uint16 green, uint16 blue);
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_fallback_new (bool enable_fallback);
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_family_new (string family);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static weak Pango.Attribute attr_foreground_new (ushort red, ushort green, ushort blue);
+       public static weak Pango.Attribute attr_foreground_new (uint16 red, uint16 green, uint16 blue);
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_gravity_hint_new (Pango.GravityHint hint);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -826,7 +836,7 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_stretch_new (Pango.Stretch stretch);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static weak Pango.Attribute attr_strikethrough_color_new (ushort red, ushort green, ushort blue);
+       public static weak Pango.Attribute attr_strikethrough_color_new (uint16 red, uint16 green, uint16 blue);
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_strikethrough_new (bool strikethrough);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -836,7 +846,7 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static Pango.AttrType attr_type_register (string name);
        [CCode (cheader_filename = "pango/pango.h")]
-       public static weak Pango.Attribute attr_underline_color_new (ushort red, ushort green, ushort blue);
+       public static weak Pango.Attribute attr_underline_color_new (uint16 red, uint16 green, uint16 blue);
        [CCode (cheader_filename = "pango/pango.h")]
        public static weak Pango.Attribute attr_underline_new (Pango.Underline underline);
        [CCode (cheader_filename = "pango/pango.h")]