summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--vapi/packages/pango/pango.gi21
-rw-r--r--vapi/packages/pango/pango.metadata4
-rw-r--r--vapi/pango.vapi10
4 files changed, 31 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f9998dec6..6cdcc5a85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-01-31 Jürg Billeter <j@bitron.ch>
+ * vapi/packages/pango/: update to pango 1.19.3
+
+ * vapi/pango.vapi: regenerated
+
+2008-01-31 Jürg Billeter <j@bitron.ch>
+
* vapi/packages/gio-2.0/: update to glib 2.15.4
* vapi/gio-2.0.vapi: regenerated
diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi
index 4f1853c5e..e8f14b0e9 100644
--- a/vapi/packages/pango/pango.gi
+++ b/vapi/packages/pango/pango.gi
@@ -130,8 +130,8 @@
<function name="extents_to_pixels" symbol="pango_extents_to_pixels">
<return-type type="void"/>
<parameters>
- <parameter name="ink_rect" type="PangoRectangle*"/>
- <parameter name="logical_rect" type="PangoRectangle*"/>
+ <parameter name="inclusive" type="PangoRectangle*"/>
+ <parameter name="nearest" type="PangoRectangle*"/>
</parameters>
</function>
<function name="find_base_dir" symbol="pango_find_base_dir">
@@ -2165,6 +2165,12 @@
<parameter name="layout" type="PangoLayout*"/>
</parameters>
</method>
+ <method name="get_height" symbol="pango_layout_get_height">
+ <return-type type="int"/>
+ <parameters>
+ <parameter name="layout" type="PangoLayout*"/>
+ </parameters>
+ </method>
<method name="get_indent" symbol="pango_layout_get_indent">
<return-type type="int"/>
<parameters>
@@ -2372,6 +2378,13 @@
<parameter name="desc" type="PangoFontDescription*"/>
</parameters>
</method>
+ <method name="set_height" symbol="pango_layout_set_height">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="layout" type="PangoLayout*"/>
+ <parameter name="height" type="int"/>
+ </parameters>
+ </method>
<method name="set_indent" symbol="pango_layout_set_indent">
<return-type type="void"/>
<parameters>
@@ -2692,8 +2705,8 @@
<constant name="PANGO_UNKNOWN_GLYPH_HEIGHT" type="int" value="14"/>
<constant name="PANGO_UNKNOWN_GLYPH_WIDTH" type="int" value="10"/>
<constant name="PANGO_VERSION_MAJOR" type="int" value="1"/>
- <constant name="PANGO_VERSION_MICRO" type="int" value="1"/>
+ <constant name="PANGO_VERSION_MICRO" type="int" value="3"/>
<constant name="PANGO_VERSION_MINOR" type="int" value="19"/>
- <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.1"/>
+ <constant name="PANGO_VERSION_STRING" type="char*" value="1.19.3"/>
</namespace>
</api>
diff --git a/vapi/packages/pango/pango.metadata b/vapi/packages/pango/pango.metadata
index 954154b20..4ae43e183 100644
--- a/vapi/packages/pango/pango.metadata
+++ b/vapi/packages/pango/pango.metadata
@@ -2,8 +2,8 @@ Pango cheader_filename="pango/pango.h"
pango_attr_size_new_absolute hidden="1"
pango_break.attrs is_array="1"
PangoColor is_value_type="1"
-pango_extents_to_pixels.ink_rect is_ref="1"
-pango_extents_to_pixels.logical_rect is_ref="1"
+pango_extents_to_pixels.inclusive is_ref="1"
+pango_extents_to_pixels.nearest is_ref="1"
pango_get_log_attrs.log_attrs is_array="1"
pango_font_get_glyph_extents.ink_rect is_out="1"
pango_font_get_glyph_extents.logical_rect is_out="1"
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index e94f90be0..eb4780b08 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -578,6 +578,7 @@ namespace Pango {
public Pango.EllipsizeMode get_ellipsize ();
public void get_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
public weak Pango.FontDescription get_font_description ();
+ public int get_height ();
public int get_indent ();
public weak Pango.LayoutIter get_iter ();
public bool get_justify ();
@@ -609,6 +610,7 @@ namespace Pango {
public void set_auto_dir (bool auto_dir);
public void set_ellipsize (Pango.EllipsizeMode ellipsize);
public void set_font_description (Pango.FontDescription desc);
+ public void set_height (int height);
public void set_indent (int indent);
public void set_justify (bool justify);
public void set_markup (string markup, int length);
@@ -730,7 +732,7 @@ namespace Pango {
public static weak Pango.Attribute attr_weight_new (Pango.Weight weight);
[NoArrayLength]
public static void @break (string text, int length, Pango.Analysis analysis, Pango.LogAttr[] attrs, int attrs_len);
- public static void extents_to_pixels (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect);
+ public static void extents_to_pixels (ref Pango.Rectangle inclusive, ref Pango.Rectangle nearest);
public static Pango.Direction find_base_dir (string text, int length);
public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start);
[NoArrayLength]
@@ -749,11 +751,11 @@ namespace Pango {
public static bool parse_variant (string str, Pango.Variant variant, bool warn);
public static bool parse_weight (string str, Pango.Weight weight, bool warn);
public static void quantize_line_geometry (int thickness, int position);
- public static int read_line (GLib.FileStream stream, GLib.String str);
+ public static int read_line (GLib.FileStream stream, GLib.StringBuilder str);
public static weak GLib.List reorder_items (GLib.List logical_items);
public static bool scan_int (out weak string pos, int @out);
- public static bool scan_string (out weak string pos, GLib.String @out);
- public static bool scan_word (out weak string pos, GLib.String @out);
+ public static bool scan_string (out weak string pos, GLib.StringBuilder @out);
+ public static bool scan_word (out weak string pos, GLib.StringBuilder @out);
public static Pango.Script script_for_unichar (unichar ch);
public static weak Pango.Language script_get_sample_language (Pango.Script script);
public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);