Commit 04b4ccf7 authored by Jürg Billeter's avatar Jürg Billeter Committed by Jürg Billeter

fix generated properties, from gobject-introspection git

2007-11-03  Juerg Billeter  <j@bitron.ch>

	* gobject-introspection/gen-introspect.c: fix generated properties, from
	  gobject-introspection git

	* vapi/packages/atk/atk.gi, vapi/packages/gdk-2.0/gdk-2.0.gi,
	  vapi/packages/gio-2.0/gio-2.0.gi, vapi/packages/gtk+-2.0/gtk+-2.0.gi,
	  vapi/packages/pango/pango.gi: regenerated

	* vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gio-2.0.vapi,
	  vapi/gtk+-2.0.vapi, vapi/pango.vapi: regenerated

svn path=/trunk/; revision=675
parent 2ca2462e
2007-11-03 Jürg Billeter <j@bitron.ch>
* gobject-introspection/gen-introspect.c: fix generated properties, from
gobject-introspection git
* vapi/packages/atk/atk.gi, vapi/packages/gdk-2.0/gdk-2.0.gi,
vapi/packages/gio-2.0/gio-2.0.gi, vapi/packages/gtk+-2.0/gtk+-2.0.gi,
vapi/packages/pango/pango.gi: regenerated
* vapi/atk.vapi, vapi/gdk-2.0.vapi, vapi/gio-2.0.vapi,
vapi/gtk+-2.0.vapi, vapi/pango.vapi: regenerated
2007-11-03 Jürg Billeter <j@bitron.ch>
* vapi/packages/pango/, vapi/packages/pangocairo/, vapi/pangocairo.deps,
......
......@@ -114,7 +114,7 @@ static void constant_generate (GIGenerator *igenerator, GIdlNodeConstant *node)
static void property_generate (GIGenerator *igenerator, GIdlNodeProperty *node)
{
char *markup = g_markup_printf_escaped ("<property name=\"%s\" type=\"%s\"/>\n", node->node.name, node->type->unparsed);
char *markup = g_markup_printf_escaped ("<property name=\"%s\" type=\"%s\" readable=\"%s\" writable=\"%s\" construct=\"%s\" construct-only=\"%s\"/>\n", node->node.name, node->type->unparsed, node->readable ? "1" : "0", node->writable ? "1" : "0", node->construct ? "1" : "0", node->construct_only ? "1" : "0");
g_igenerator_write (igenerator, markup);
g_free (markup);
}
......@@ -425,6 +425,10 @@ static void g_igenerator_process_properties (GIGenerator *igenerator, GIdlNodeIn
giprop->node.name = properties[i]->name;
ginode->members = g_list_insert_sorted (ginode->members, giprop, (GCompareFunc) g_idl_node_cmp);
giprop->type = get_type_from_type_id (properties[i]->value_type);
giprop->readable = (properties[i]->flags & G_PARAM_READABLE) != 0;
giprop->writable = (properties[i]->flags & G_PARAM_WRITABLE) != 0;
giprop->construct = (properties[i]->flags & G_PARAM_CONSTRUCT) != 0;
giprop->construct_only = (properties[i]->flags & G_PARAM_CONSTRUCT_ONLY) != 0;
}
}
......
......@@ -292,14 +292,12 @@ namespace Atk {
public bool is_inline ();
public virtual bool is_selected_link ();
public virtual bool is_valid ();
public weak int end_index { get; }
[NoAccessorMethod]
public weak int end_index { get; set; }
public weak int number_of_anchors { get; }
[NoAccessorMethod]
public weak int number_of_anchors { get; set; }
[NoAccessorMethod]
public weak bool selected_link { get; set; }
[NoAccessorMethod]
public weak int start_index { get; set; }
public weak bool selected_link { get; }
public weak int start_index { get; }
public signal void link_activated ();
}
[CCode (cheader_filename = "atk/atk.h")]
......@@ -346,13 +344,13 @@ namespace Atk {
public virtual void set_parent (Atk.Object parent);
public virtual void set_role (Atk.Role role);
[NoAccessorMethod]
public weak int accessible_component_layer { get; set; }
public weak int accessible_component_layer { get; }
[NoAccessorMethod]
public weak int accessible_component_mdi_zorder { get; set; }
public weak int accessible_component_mdi_zorder { get; }
[NoAccessorMethod]
public weak string accessible_description { get; set; }
[NoAccessorMethod]
public weak int accessible_hypertext_nlinks { get; set; }
public weak int accessible_hypertext_nlinks { get; }
[NoAccessorMethod]
public weak string accessible_name { get; set; }
[NoAccessorMethod]
......
......@@ -1331,7 +1331,7 @@ namespace Gdk {
public void set_override_color (Pango.RenderPart part, out Gdk.Color color);
public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple);
[NoAccessorMethod]
public weak Gdk.Screen screen { get; set; }
public weak Gdk.Screen screen { get; construct; }
}
[CCode (cheader_filename = "gdk/gdk.h")]
public class Pixbuf : GLib.Object {
......@@ -1390,21 +1390,21 @@ namespace Gdk {
public weak Gdk.Pixbuf scale_simple (int dest_width, int dest_height, Gdk.InterpType interp_type);
public void unref ();
[NoAccessorMethod]
public weak int bits_per_sample { get; set; }
public weak int bits_per_sample { get; construct; }
[NoAccessorMethod]
public weak Gdk.Colorspace colorspace { get; set; }
public weak Gdk.Colorspace colorspace { get; construct; }
[NoAccessorMethod]
public weak bool has_alpha { get; set; }
public weak bool has_alpha { get; construct; }
[NoAccessorMethod]
public weak int height { get; set; }
public weak int height { get; construct; }
[NoAccessorMethod]
public weak int n_channels { get; set; }
public weak int n_channels { get; construct; }
[NoAccessorMethod]
public weak pointer pixels { get; set; }
public weak pointer pixels { get; construct; }
[NoAccessorMethod]
public weak int rowstride { get; set; }
public weak int rowstride { get; construct; }
[NoAccessorMethod]
public weak int width { get; set; }
public weak int width { get; construct; }
}
[CCode (cheader_filename = "gdk/gdk.h")]
public class PixbufAnimation : GLib.Object {
......
......@@ -199,7 +199,7 @@ namespace GLib {
public BufferedInputStream.sized (GLib.InputStream base_stream, ulong size);
public ulong peek (pointer buffer, ulong offset, ulong count);
public void set_buffer_size (ulong size);
public weak uint buffer_size { get; set; }
public weak uint buffer_size { get; set construct; }
}
[CCode (cheader_filename = "gio/gvfs.h")]
public class BufferedOutputStream : GLib.FilterOutputStream {
......@@ -209,7 +209,7 @@ namespace GLib {
public BufferedOutputStream.sized (GLib.OutputStream base_stream, uint size);
public void set_auto_grow (bool auto_grow);
public void set_buffer_size (ulong size);
public weak uint buffer_size { get; set; }
public weak uint buffer_size { get; construct; }
}
[CCode (cheader_filename = "gio/gvfs.h")]
public class Cancellable : GLib.Object {
......@@ -383,13 +383,13 @@ namespace GLib {
public class FilterInputStream : GLib.InputStream {
public weak GLib.InputStream get_base_stream ();
[NoAccessorMethod]
public weak GLib.InputStream base_stream { get; set; }
public weak GLib.InputStream base_stream { get; construct; }
}
[CCode (cheader_filename = "gio/gvfs.h")]
public class FilterOutputStream : GLib.OutputStream {
public weak GLib.OutputStream get_base_stream ();
[NoAccessorMethod]
public weak GLib.OutputStream base_stream { get; set; }
public weak GLib.OutputStream base_stream { get; construct; }
}
[CCode (cheader_filename = "gio/gvfs.h")]
public class IOModule : GLib.TypeModule, GLib.TypePlugin {
......@@ -427,7 +427,7 @@ namespace GLib {
public void set_free_on_close (bool free_on_close);
public void set_max_size (uint max_size);
[NoAccessorMethod]
public weak pointer data { get; set; }
public weak pointer data { get; set construct; }
[NoAccessorMethod]
public weak bool free_array { get; set; }
[NoAccessorMethod]
......
This diff is collapsed.
......@@ -481,10 +481,10 @@
<parameter name="link_" type="AtkHyperlink*"/>
</parameters>
</method>
<property name="end-index" type="gint"/>
<property name="number-of-anchors" type="gint"/>
<property name="selected-link" type="gboolean"/>
<property name="start-index" type="gint"/>
<property name="end-index" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="number-of-anchors" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="selected-link" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="start-index" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<signal name="link-activated" when="LAST">
<return-type type="void"/>
<parameters>
......@@ -743,21 +743,21 @@
<parameter name="role" type="AtkRole"/>
</parameters>
</method>
<property name="accessible-component-layer" type="gint"/>
<property name="accessible-component-mdi-zorder" type="gint"/>
<property name="accessible-description" type="char*"/>
<property name="accessible-hypertext-nlinks" type="gint"/>
<property name="accessible-name" type="char*"/>
<property name="accessible-parent" type="AtkObject*"/>
<property name="accessible-role" type="gint"/>
<property name="accessible-table-caption" type="char*"/>
<property name="accessible-table-caption-object" type="AtkObject*"/>
<property name="accessible-table-column-description" type="char*"/>
<property name="accessible-table-column-header" type="AtkObject*"/>
<property name="accessible-table-row-description" type="char*"/>
<property name="accessible-table-row-header" type="AtkObject*"/>
<property name="accessible-table-summary" type="AtkObject*"/>
<property name="accessible-value" type="gdouble"/>
<property name="accessible-component-layer" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="accessible-component-mdi-zorder" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="accessible-description" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-hypertext-nlinks" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
<property name="accessible-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-parent" type="AtkObject*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-role" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-caption" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-caption-object" type="AtkObject*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-column-description" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-column-header" type="AtkObject*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-row-description" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-row-header" type="AtkObject*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-table-summary" type="AtkObject*" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="accessible-value" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
<signal name="active-descendant-changed" when="LAST">
<return-type type="void"/>
<parameters>
......@@ -1038,8 +1038,8 @@
<parameter name="name" type="gchar*"/>
</parameters>
</method>
<property name="relation-type" type="AtkRelationType"/>
<property name="target" type="GValueArray*"/>
<property name="relation-type" type="AtkRelationType" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="target" type="GValueArray*" readable="1" writable="1" construct="0" construct-only="0"/>
<field name="target" type="GPtrArray*"/>
<field name="relationship" type="AtkRelationType"/>
</object>
......
......@@ -3427,7 +3427,7 @@
<parameter name="display" type="GdkDisplay*"/>
</parameters>
</method>
<property name="default-display" type="GdkDisplay*"/>
<property name="default-display" type="GdkDisplay*" readable="1" writable="1" construct="0" construct-only="0"/>
<signal name="display-opened" when="LAST">
<return-type type="void"/>
<parameters>
......@@ -4256,7 +4256,7 @@
<parameter name="stipple" type="GdkBitmap*"/>
</parameters>
</method>
<property name="screen" type="GdkScreen*"/>
<property name="screen" type="GdkScreen*" readable="1" writable="1" construct="0" construct-only="1"/>
</object>
<object name="GdkPixbuf" parent="GObject" type-name="GdkPixbuf" get-type="gdk_pixbuf_get_type">
<method name="add_alpha" symbol="gdk_pixbuf_add_alpha">
......@@ -4725,14 +4725,14 @@
<parameter name="pixbuf" type="GdkPixbuf*"/>
</parameters>
</method>
<property name="bits-per-sample" type="gint"/>
<property name="colorspace" type="GdkColorspace"/>
<property name="has-alpha" type="gboolean"/>
<property name="height" type="gint"/>
<property name="n-channels" type="gint"/>
<property name="pixels" type="gpointer"/>
<property name="rowstride" type="gint"/>
<property name="width" type="gint"/>
<property name="bits-per-sample" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="colorspace" type="GdkColorspace" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="has-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="height" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="n-channels" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="pixels" type="gpointer" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="rowstride" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
<property name="width" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
</object>
<object name="GdkPixbufAnimation" parent="GObject" type-name="GdkPixbufAnimation" get-type="gdk_pixbuf_animation_get_type">
<method name="get_height" symbol="gdk_pixbuf_animation_get_height">
......@@ -5233,8 +5233,8 @@
<method name="width_mm" symbol="gdk_screen_width_mm">
<return-type type="gint"/>
</method>
<property name="font-options" type="gpointer"/>
<property name="resolution" type="gdouble"/>
<property name="font-options" type="gpointer" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="resolution" type="gdouble" readable="1" writable="1" construct="0" construct-only="0"/>
<signal name="composited-changed" when="LAST">
<return-type type="void"/>
<parameters>
......
......@@ -650,7 +650,7 @@
<parameter name="size" type="gsize"/>
</parameters>
</method>
<property name="buffer-size" type="guint"/>
<property name="buffer-size" type="guint" readable="1" writable="1" construct="1" construct-only="0"/>
<vfunc name="fill">
<return-type type="gssize"/>
<parameters>
......@@ -720,7 +720,7 @@
<parameter name="size" type="gsize"/>
</parameters>
</method>
<property name="buffer-size" type="guint"/>
<property name="buffer-size" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
</object>
<object name="GCancellable" parent="GObject" type-name="GCancellable" get-type="g_cancellable_get_type">
<method name="cancel" symbol="g_cancellable_cancel">
......@@ -1898,7 +1898,7 @@
<parameter name="stream" type="GFilterInputStream*"/>
</parameters>
</method>
<property name="base-stream" type="GInputStream*"/>
<property name="base-stream" type="GInputStream*" readable="1" writable="1" construct="0" construct-only="1"/>
<field name="base_stream" type="GInputStream*"/>
</object>
<object name="GFilterOutputStream" parent="GOutputStream" type-name="GFilterOutputStream" get-type="g_filter_output_stream_get_type">
......@@ -1908,7 +1908,7 @@
<parameter name="stream" type="GFilterOutputStream*"/>
</parameters>
</method>
<property name="base-stream" type="GOutputStream*"/>
<property name="base-stream" type="GOutputStream*" readable="1" writable="1" construct="0" construct-only="1"/>
<field name="base_stream" type="GOutputStream*"/>
</object>
<object name="GIOModule" parent="GTypeModule" type-name="GIOModule" get-type="g_io_module_get_type">
......@@ -2195,9 +2195,9 @@
<parameter name="max_size" type="guint"/>
</parameters>
</method>
<property name="data" type="gpointer"/>
<property name="free-array" type="gboolean"/>
<property name="size-limit" type="guint"/>
<property name="data" type="gpointer" readable="1" writable="1" construct="1" construct-only="0"/>
<property name="free-array" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
<property name="size-limit" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
</object>
<object name="GMountOperation" parent="GObject" type-name="GMountOperation" get-type="g_mount_operation_get_type">
<method name="get_anonymous" symbol="g_mount_operation_get_anonymous">
......
This diff is collapsed.
......@@ -127,19 +127,6 @@
<parameter name="attrs_len" type="int"/>
</parameters>
</function>
<function name="cairo_context_get_resolution" symbol="pango_cairo_context_get_resolution">
<return-type type="double"/>
<parameters>
<parameter name="context" type="PangoContext*"/>
</parameters>
</function>
<function name="cairo_context_set_resolution" symbol="pango_cairo_context_set_resolution">
<return-type type="void"/>
<parameters>
<parameter name="context" type="PangoContext*"/>
<parameter name="dpi" type="double"/>
</parameters>
</function>
<function name="extents_to_pixels" symbol="pango_extents_to_pixels">
<return-type type="void"/>
<parameters>
......@@ -601,35 +588,6 @@
<field name="start_index" type="guint"/>
<field name="end_index" type="guint"/>
</struct>
<struct name="PangoCairoFont">
</struct>
<struct name="PangoCairoFontMap">
<method name="create_context" symbol="pango_cairo_font_map_create_context">
<return-type type="PangoContext*"/>
<parameters>
<parameter name="fontmap" type="PangoCairoFontMap*"/>
</parameters>
</method>
<method name="get_default" symbol="pango_cairo_font_map_get_default">
<return-type type="PangoFontMap*"/>
</method>
<method name="get_resolution" symbol="pango_cairo_font_map_get_resolution">
<return-type type="double"/>
<parameters>
<parameter name="fontmap" type="PangoCairoFontMap*"/>
</parameters>
</method>
<method name="new" symbol="pango_cairo_font_map_new">
<return-type type="PangoFontMap*"/>
</method>
<method name="set_resolution" symbol="pango_cairo_font_map_set_resolution">
<return-type type="void"/>
<parameters>
<parameter name="fontmap" type="PangoCairoFontMap*"/>
<parameter name="dpi" type="double"/>
</parameters>
</method>
</struct>
<struct name="PangoContextClass">
</struct>
<struct name="PangoCoverage">
......
......@@ -307,6 +307,7 @@ namespace Pango {
public uint end_index;
public weak Pango.Attribute copy ();
public bool equal (Pango.Attribute attr2);
public void init (pointer klass);
}
[CCode (cheader_filename = "pango/pango.h")]
public class ContextClass {
......@@ -345,15 +346,6 @@ namespace Pango {
public weak Pango.GlyphVisAttr attr;
}
[CCode (cheader_filename = "pango/pango.h")]
public class GlyphItem {
public weak Pango.Item item;
public weak Pango.GlyphString glyphs;
public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
[NoArrayLength]
public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
public weak Pango.GlyphItem split (string text, int split_index);
}
[CCode (cheader_filename = "pango/pango.h")]
public class GlyphUnit {
}
[CCode (cheader_filename = "pango/pango.h")]
......@@ -427,6 +419,16 @@ namespace Pango {
public int get_underline_position ();
public int get_underline_thickness ();
}
[CCode (copy_function = "pango_glyph_item_copy", cheader_filename = "pango/pango.h")]
public class GlyphItem : GLib.Boxed {
public weak Pango.Item item;
public weak Pango.GlyphString glyphs;
public weak GLib.SList apply_attrs (string text, Pango.AttrList list);
public weak Pango.GlyphItem copy ();
[NoArrayLength]
public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
public weak Pango.GlyphItem split (string text, int split_index);
}
[CCode (copy_function = "pango_glyph_string_copy", cheader_filename = "pango/pango.h")]
public class GlyphString : GLib.Boxed {
public int num_glyphs;
......@@ -453,13 +455,15 @@ namespace Pango {
public Item ();
public weak Pango.Item split (int split_index, int split_offset);
}
[CCode (cheader_filename = "pango/pango.h")]
[CCode (copy_function = "pango_layout_iter_copy", cheader_filename = "pango/pango.h")]
public class LayoutIter : GLib.Boxed {
public bool at_last_line ();
public weak Pango.LayoutIter copy ();
public int get_baseline ();
public void get_char_extents (out Pango.Rectangle logical_rect);
public void get_cluster_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
public int get_index ();
public weak Pango.Layout get_layout ();
public void get_layout_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
public weak Pango.LayoutLine get_line ();
public void get_line_extents (out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
......@@ -633,6 +637,8 @@ namespace Pango {
public virtual void draw_rectangle (Pango.RenderPart part, int x, int y, int width, int height);
public virtual void draw_trapezoid (Pango.RenderPart part, double y1_, double x11, double x21, double y2, double x12, double x22);
public Pango.Color get_color (Pango.RenderPart part);
public weak Pango.Layout get_layout ();
public weak Pango.LayoutLine get_layout_line ();
public Pango.Matrix get_matrix ();
public virtual void part_changed (Pango.RenderPart part);
public void set_color (Pango.RenderPart part, out Pango.Color color);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment