[vala] GlyphInfo, GlyphGeometry, GlyphVisAttr must be struct not class.
- From: Jaap A. Haitsma <jhaitsma src gnome org>
- To: svn-commits-list gnome org
- Subject: [vala] GlyphInfo, GlyphGeometry, GlyphVisAttr must be struct not class.
- Date: Sat, 4 Jul 2009 14:59:37 +0000 (UTC)
commit e873b907b3b81cdcb390f716f29dbf43c1b88678
Author: Jaap A. Haitsma <jaap haitsma org>
Date: Sat Jul 4 16:58:56 2009 +0200
GlyphInfo, GlyphGeometry, GlyphVisAttr must be struct not class.
vapi/packages/pango/pango.metadata | 3 ++
vapi/pango.vapi | 37 ++++++++++++++++-------------------
2 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/vapi/packages/pango/pango.metadata b/vapi/packages/pango/pango.metadata
index f0ba761..f61823e 100644
--- a/vapi/packages/pango/pango.metadata
+++ b/vapi/packages/pango/pango.metadata
@@ -10,11 +10,14 @@ pango_font_get_glyph_extents.logical_rect is_out="1"
# PangoFontDescription should be opaque value type
PangoFontDescription is_immutable="1"
pango_font_description_from_string transfer_ownership="1"
+PangoGlyphInfo is_value_type="1"
pango_glyph_item_letter_space.log_attrs is_array="1"
+PangoGlyphGeometry is_value_type="1"
pango_glyph_string_extents.ink_rect is_out="1"
pango_glyph_string_extents.logical_rect is_out="1"
pango_glyph_string_extents_range.ink_rect is_out="1"
pango_glyph_string_extents_range.logical_rect is_out="1"
+PangoGlyphVisAttr is_value_type="1"
pango_layout_get_cursor_pos.strong_pos is_out="1"
pango_layout_get_cursor_pos.weak_pos is_out="1"
pango_layout_get_extents.ink_rect is_out="1"
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index ad0e13a..fc44a98 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -257,20 +257,6 @@ namespace Pango {
public class Glyph {
}
[Compact]
- [CCode (cheader_filename = "pango/pango.h")]
- public class GlyphGeometry {
- public weak Pango.GlyphUnit width;
- public weak Pango.GlyphUnit x_offset;
- public weak Pango.GlyphUnit y_offset;
- }
- [Compact]
- [CCode (cheader_filename = "pango/pango.h")]
- public class GlyphInfo {
- public weak Pango.GlyphVisAttr attr;
- public weak Pango.GlyphGeometry geometry;
- public weak Pango.Glyph glyph;
- }
- [Compact]
[CCode (copy_function = "pango_glyph_item_copy", type_id = "PANGO_TYPE_GLYPH_ITEM", cheader_filename = "pango/pango.h")]
public class GlyphItem {
public weak Pango.GlyphString glyphs;
@@ -300,7 +286,7 @@ namespace Pango {
[Compact]
[CCode (copy_function = "pango_glyph_string_copy", type_id = "PANGO_TYPE_GLYPH_STRING", cheader_filename = "pango/pango.h")]
public class GlyphString {
- public weak Pango.GlyphInfo glyphs;
+ public Pango.GlyphInfo glyphs;
public int log_clusters;
public int num_glyphs;
public int space;
@@ -320,11 +306,6 @@ namespace Pango {
public class GlyphUnit {
}
[Compact]
- [CCode (cheader_filename = "pango/pango.h")]
- public class GlyphVisAttr {
- public uint is_cluster_start;
- }
- [Compact]
[CCode (copy_function = "pango_item_copy", type_id = "PANGO_TYPE_ITEM", cheader_filename = "pango/pango.h")]
public class Item {
public weak Pango.Analysis analysis;
@@ -516,6 +497,22 @@ namespace Pango {
public bool parse (string spec);
public unowned string to_string ();
}
+ [CCode (type_id = "PANGO_TYPE_GLYPH_GEOMETRY", cheader_filename = "pango/pango.h")]
+ public struct GlyphGeometry {
+ public weak Pango.GlyphUnit width;
+ public weak Pango.GlyphUnit x_offset;
+ public weak Pango.GlyphUnit y_offset;
+ }
+ [CCode (type_id = "PANGO_TYPE_GLYPH_INFO", cheader_filename = "pango/pango.h")]
+ public struct GlyphInfo {
+ public weak Pango.Glyph glyph;
+ public Pango.GlyphGeometry geometry;
+ public Pango.GlyphVisAttr attr;
+ }
+ [CCode (type_id = "PANGO_TYPE_GLYPH_VIS_ATTR", cheader_filename = "pango/pango.h")]
+ public struct GlyphVisAttr {
+ public uint is_cluster_start;
+ }
[CCode (type_id = "PANGO_TYPE_LOG_ATTR", cheader_filename = "pango/pango.h")]
public struct LogAttr {
public uint is_line_break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]