vala r2201 - in trunk: . vapi vapi/packages/pango

[juergbi svn gnome org]

Author: juergbi
Date: Wed Dec 17 21:22:35 2008
New Revision: 2201
URL: http://svn.gnome.org/viewvc/vala?rev=2201&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/vapi/packages/pango/pango-custom.vala
   trunk/vapi/pango.vapi

Modified: trunk/vapi/packages/pango/pango-custom.vala
==============================================================================
--- trunk/vapi/packages/pango/pango-custom.vala	(original)
+++ trunk/vapi/packages/pango/pango-custom.vala	Wed Dec 17 21:22:35 2008
@@ -24,4 +24,15 @@
 	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
+	}
 }

Modified: trunk/vapi/pango.vapi
==============================================================================
--- trunk/vapi/pango.vapi	(original)
+++ trunk/vapi/pango.vapi	Wed Dec 17 21:22:35 2008
@@ -169,7 +169,7 @@
 		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 @@
 	}
 	[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 @@
 		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 @@
 		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 @@
 	[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 @@
 	[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 @@
 	[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")]