From: Juerg Billeter Date: Sat, 3 Nov 2007 15:28:20 +0000 (+0000) Subject: fix generated properties, from gobject-introspection git X-Git-Tag: VALA_0_1_5~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04b4ccf726eee2128ad951c243133d4587b53344;p=thirdparty%2Fvala.git fix generated properties, from gobject-introspection git 2007-11-03 Juerg Billeter * 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 --- diff --git a/ChangeLog b/ChangeLog index c3a2e4161..d226b29cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-11-03 Jürg Billeter + + * 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 * vapi/packages/pango/, vapi/packages/pangocairo/, vapi/pangocairo.deps, diff --git a/gobject-introspection/gen-introspect.c b/gobject-introspection/gen-introspect.c index 5edb5ef96..34fb0e8c7 100644 --- a/gobject-introspection/gen-introspect.c +++ b/gobject-introspection/gen-introspect.c @@ -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 ("\n", node->node.name, node->type->unparsed); + char *markup = g_markup_printf_escaped ("\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; } } diff --git a/vapi/atk.vapi b/vapi/atk.vapi index 5c0011c30..1b9931945 100644 --- a/vapi/atk.vapi +++ b/vapi/atk.vapi @@ -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] diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi index d8e359569..5c3966713 100644 --- a/vapi/gdk-2.0.vapi +++ b/vapi/gdk-2.0.vapi @@ -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 { diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 75fc338fe..9ac617e61 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -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] diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 819120b78..75dcde64a 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -1076,7 +1076,7 @@ namespace Gtk { [NoAccessorMethod] public weak bool can_focus { get; set; } [NoAccessorMethod] - public weak bool composite_child { get; set; } + public weak bool composite_child { get; } public weak Gdk.EventMask events { get; set; } public weak Gdk.ExtensionMode extension_events { get; set; } [NoAccessorMethod] @@ -2041,7 +2041,7 @@ namespace Gtk { [NoAccessorMethod] public weak string label { get; set; } [NoAccessorMethod] - public weak string name { get; set; } + public weak string name { get; construct; } public weak bool sensitive { get; set; } [NoAccessorMethod] public weak string short_label { get; set; } @@ -2088,7 +2088,7 @@ namespace Gtk { public void set_visible (bool visible); public weak string translate_string (string string); [NoAccessorMethod] - public weak string name { get; set; } + public weak string name { get; construct; } public weak bool sensitive { get; set; } public weak bool visible { get; set; } public signal void connect_proxy (Gtk.Action p0, Gtk.Widget p1); @@ -2268,10 +2268,10 @@ namespace Gtk { public weak bool focus_on_click { get; set; } public weak Gtk.Widget image { get; set; } public weak Gtk.PositionType image_position { get; set; } - public weak string label { get; set; } + public weak string label { get; set construct; } public weak Gtk.ReliefStyle relief { get; set; } - public weak bool use_stock { get; set; } - public weak bool use_underline { get; set; } + public weak bool use_stock { get; set construct; } + public weak bool use_underline { get; set construct; } [NoAccessorMethod] public weak float xalign { get; set; } [NoAccessorMethod] @@ -2414,7 +2414,7 @@ namespace Gtk { public void swap_rows (int row1, int row2); public void thaw (); [NoAccessorMethod] - public weak uint n_columns { get; set; } + public weak uint n_columns { get; construct; } [NoAccessorMethod] public weak bool reorderable { get; set; } [NoAccessorMethod] @@ -2511,13 +2511,13 @@ namespace Gtk { [NoAccessorMethod] public weak Gtk.CTreeLineStyle line_style { get; set; } [NoAccessorMethod] - public weak uint n_columns { get; set; } + public weak uint n_columns { get; construct; } [NoAccessorMethod] public weak bool show_stub { get; set; } [NoAccessorMethod] public weak uint spacing { get; set; } [NoAccessorMethod] - public weak uint tree_column { get; set; } + public weak uint tree_column { get; construct; } public signal void change_focus_row_expansion (Gtk.CTreeExpansionType action); public signal void tree_collapse (Gtk.CTreeNode node); public signal void tree_expand (Gtk.CTreeNode node); @@ -2587,7 +2587,7 @@ namespace Gtk { public virtual weak Gtk.CellEditable start_editing (Gdk.Event event, Gtk.Widget widget, string path, out Gdk.Rectangle background_area, out Gdk.Rectangle cell_area, Gtk.CellRendererState flags); public void stop_editing (bool canceled); [NoAccessorMethod] - public weak string cell_background { get; set; } + public weak string cell_background { set; } [NoAccessorMethod] public weak Gdk.Color cell_background_gdk { get; set; } [NoAccessorMethod] @@ -2708,7 +2708,7 @@ namespace Gtk { [NoAccessorMethod] public weak Pango.AttrList attributes { get; set; } [NoAccessorMethod] - public weak string background { get; set; } + public weak string background { set; } [NoAccessorMethod] public weak Gdk.Color background_gdk { get; set; } [NoAccessorMethod] @@ -2730,7 +2730,7 @@ namespace Gtk { [NoAccessorMethod] public weak Pango.FontDescription font_desc { get; set; } [NoAccessorMethod] - public weak string foreground { get; set; } + public weak string foreground { set; } [NoAccessorMethod] public weak Gdk.Color foreground_gdk { get; set; } [NoAccessorMethod] @@ -2740,7 +2740,7 @@ namespace Gtk { [NoAccessorMethod] public weak bool language_set { get; set; } [NoAccessorMethod] - public weak string markup { get; set; } + public weak string markup { set; } [NoAccessorMethod] public weak int rise { get; set; } [NoAccessorMethod] @@ -2821,7 +2821,7 @@ namespace Gtk { public void set_displayed_row (Gtk.TreePath path); public void set_model (Gtk.TreeModel model); [NoAccessorMethod] - public weak string background { get; set; } + public weak string background { set; } [NoAccessorMethod] public weak Gdk.Color background_gdk { get; set; } [NoAccessorMethod] @@ -3016,7 +3016,7 @@ namespace Gtk { public weak bool has_frame { get; set; } public weak Gtk.TreeModel model { get; set; } [NoAccessorMethod] - public weak bool popup_shown { get; set; } + public weak bool popup_shown { get; } public weak int row_span_column { get; set; } [NoAccessorMethod] public weak string tearoff_title { get; set; } @@ -3074,7 +3074,7 @@ namespace Gtk { public void unset_focus_chain (); public weak uint border_width { get; set; } [NoAccessorMethod] - public weak Gtk.Widget child { get; set; } + public weak Gtk.Widget child { set; } public weak Gtk.ResizeMode resize_mode { get; set; } [HasEmitter] public signal void add (Gtk.Widget widget); @@ -3216,7 +3216,7 @@ namespace Gtk { public int text_index_to_layout_index (int text_index); public weak bool activates_default { get; set; } [NoAccessorMethod] - public weak int cursor_position { get; set; } + public weak int cursor_position { get; } [NoAccessorMethod] public weak bool editable { get; set; } public weak bool has_frame { get; set; } @@ -3224,9 +3224,9 @@ namespace Gtk { public weak uint invisible_char { get; set; } public weak int max_length { get; set; } [NoAccessorMethod] - public weak int scroll_offset { get; set; } + public weak int scroll_offset { get; } [NoAccessorMethod] - public weak int selection_bound { get; set; } + public weak int selection_bound { get; } [NoAccessorMethod] public weak Gtk.ShadowType shadow_type { get; set; } public weak string text { get; set; } @@ -3313,12 +3313,12 @@ namespace Gtk { public void set_spacing (int spacing); public void set_use_markup (bool use_markup); public void set_use_underline (bool use_underline); - public weak bool expanded { get; set; } - public weak string label { get; set; } + public weak bool expanded { get; set construct; } + public weak string label { get; set construct; } public weak Gtk.Widget label_widget { get; set; } public weak int spacing { get; set; } - public weak bool use_markup { get; set; } - public weak bool use_underline { get; set; } + public weak bool use_markup { get; set construct; } + public weak bool use_underline { get; set construct; } public signal void activate (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -3333,7 +3333,7 @@ namespace Gtk { public void set_title (string title); public void set_width_chars (int n_chars); [NoAccessorMethod] - public weak Gtk.FileChooser dialog { get; set; } + public weak Gtk.FileChooser dialog { construct; } public weak bool focus_on_click { get; set; } public weak string title { get; set; } public weak int width_chars { get; set; } @@ -3453,8 +3453,7 @@ namespace Gtk { public FontSelection (); public bool set_font_name (string fontname); public void set_preview_text (string text); - [NoAccessorMethod] - public weak Gdk.Font font { get; set; } + public weak Gdk.Font font { get; } public weak string font_name { get; set; } public weak string preview_text { get; set; } } @@ -3777,8 +3776,7 @@ namespace Gtk { public weak Gdk.Pixmap pixmap { get; set; } [NoAccessorMethod] public weak string stock { get; set; } - [NoAccessorMethod] - public weak Gtk.ImageType storage_type { get; set; } + public weak Gtk.ImageType storage_type { get; } } [CCode (cheader_filename = "gtk/gtk.h")] public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable { @@ -3914,19 +3912,17 @@ namespace Gtk { public weak double angle { get; set; } public weak Pango.AttrList attributes { get; set; } [NoAccessorMethod] - public weak int cursor_position { get; set; } + public weak int cursor_position { get; } public weak Pango.EllipsizeMode ellipsize { get; set; } public weak Gtk.Justification justify { get; set; } public weak string label { get; set; } public weak int max_width_chars { get; set; } - [NoAccessorMethod] - public weak uint mnemonic_keyval { get; set; } + public weak uint mnemonic_keyval { get; } public weak Gtk.Widget mnemonic_widget { get; set; } - [NoAccessorMethod] - public weak string pattern { get; set; } + public weak string pattern { set; } public weak bool selectable { get; set; } [NoAccessorMethod] - public weak int selection_bound { get; set; } + public weak int selection_bound { get; } public weak bool single_line_mode { get; set; } public weak bool use_markup { get; set; } public weak bool use_underline { get; set; } @@ -4234,11 +4230,11 @@ namespace Gtk { public void set_image (Gtk.Widget image); public void set_markup (string str); [NoAccessorMethod] - public weak Gtk.ButtonsType buttons { get; set; } + public weak Gtk.ButtonsType buttons { construct; } [NoAccessorMethod] public weak Gtk.Widget image { get; set; } [NoAccessorMethod] - public weak Gtk.MessageType message_type { get; set; } + public weak Gtk.MessageType message_type { get; set construct; } [NoAccessorMethod] public weak string secondary_text { get; set; } [NoAccessorMethod] @@ -4341,8 +4337,7 @@ namespace Gtk { public weak bool scrollable { get; set; } public weak bool show_border { get; set; } public weak bool show_tabs { get; set; } - [NoAccessorMethod] - public weak uint tab_border { get; set; } + public weak uint tab_border { set; } [NoAccessorMethod] public weak uint tab_hborder { get; set; } public weak Gtk.PositionType tab_pos { get; set; } @@ -4486,9 +4481,9 @@ namespace Gtk { public void pack2 (Gtk.Widget child, bool resize, bool shrink); public void set_position (int position); [NoAccessorMethod] - public weak int max_position { get; set; } + public weak int max_position { get; } [NoAccessorMethod] - public weak int min_position { get; set; } + public weak int min_position { get; } public weak int position { get; set; } [NoAccessorMethod] public weak bool position_set { get; set; } @@ -4523,7 +4518,7 @@ namespace Gtk { public Plug (Gdk.NativeWindow socket_id); public Plug.for_display (Gdk.Display display, Gdk.NativeWindow socket_id); [NoAccessorMethod] - public weak bool embedded { get; set; } + public weak bool embedded { get; } } [CCode (cheader_filename = "gtk/gtk.h")] public class Preview : Gtk.Widget, Atk.Implementor, Gtk.Buildable { @@ -4605,10 +4600,8 @@ namespace Gtk { public weak Gtk.PrintSettings print_settings { get; set; } [NoAccessorMethod] public weak bool show_progress { get; set; } - [NoAccessorMethod] - public weak Gtk.PrintStatus status { get; set; } - [NoAccessorMethod] - public weak string status_string { get; set; } + public weak Gtk.PrintStatus status { get; } + public weak string status_string { get; } [NoAccessorMethod] public weak bool track_print_status { get; set; } [NoAccessorMethod] @@ -4774,7 +4767,7 @@ namespace Gtk { public void set_current_value (int current_value); public void set_group (GLib.SList group); public weak int current_value { get; set; } - public weak Gtk.RadioAction group { get; set; } + public weak Gtk.RadioAction group { set; } [NoAccessorMethod] public weak int value { get; set; } public signal void changed (Gtk.RadioAction current); @@ -4789,7 +4782,7 @@ namespace Gtk { public RadioButton.with_mnemonic (GLib.SList group, string label); public RadioButton.with_mnemonic_from_widget (Gtk.RadioButton radio_group_member, string label); public void set_group (GLib.SList group); - public weak Gtk.RadioButton group { get; set; } + public weak Gtk.RadioButton group { set; } public signal void group_changed (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -4802,7 +4795,7 @@ namespace Gtk { public RadioMenuItem.with_mnemonic (GLib.SList group, string label); public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label); public void set_group (GLib.SList group); - public weak Gtk.RadioMenuItem group { get; set; } + public weak Gtk.RadioMenuItem group { set; } public signal void group_changed (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -4813,7 +4806,7 @@ namespace Gtk { public RadioToolButton.from_widget (Gtk.RadioToolButton group); public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id); public void set_group (GLib.SList group); - public weak Gtk.RadioToolButton group { get; set; } + public weak Gtk.RadioToolButton group { set; } } [CCode (cheader_filename = "gtk/gtk.h")] public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable { @@ -4858,7 +4851,7 @@ namespace Gtk { public void set_update_policy (Gtk.UpdateType policy); public void set_upper_stepper_sensitivity (Gtk.SensitivityType sensitivity); public void set_value (double value); - public weak Gtk.Adjustment adjustment { get; set; } + public weak Gtk.Adjustment adjustment { get; set construct; } public weak double fill_level { get; set; } public weak bool inverted { get; set; } public weak Gtk.SensitivityType lower_stepper_sensitivity { get; set; } @@ -4951,10 +4944,10 @@ namespace Gtk { public void set_limit (int limit); public void set_screen (Gdk.Screen screen); [NoAccessorMethod] - public weak string filename { get; set; } + public weak string filename { get; construct; } public weak int limit { get; set; } [NoAccessorMethod] - public weak int size { get; set; } + public weak int size { get; } public signal void changed (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -5042,11 +5035,11 @@ namespace Gtk { public void set_shadow_type (Gtk.ShadowType type); public void set_vadjustment (Gtk.Adjustment vadjustment); public void unset_placement (); - public weak Gtk.Adjustment hadjustment { get; set; } + public weak Gtk.Adjustment hadjustment { get; set construct; } [NoAccessorMethod] public weak Gtk.PolicyType hscrollbar_policy { get; set; } public weak Gtk.ShadowType shadow_type { get; set; } - public weak Gtk.Adjustment vadjustment { get; set; } + public weak Gtk.Adjustment vadjustment { get; set construct; } [NoAccessorMethod] public weak Gtk.PolicyType vscrollbar_policy { get; set; } [NoAccessorMethod] @@ -5085,7 +5078,7 @@ namespace Gtk { public void set_property_value (string name, Gtk.SettingsValue svalue); public void set_string_property (string name, string v_string, string origin); [NoAccessorMethod] - public weak GLib.HashTable color_hash { get; set; } + public weak GLib.HashTable color_hash { get; } [NoAccessorMethod] public weak bool gtk_alternative_button_order { get; set; } [NoAccessorMethod] @@ -5293,22 +5286,20 @@ namespace Gtk { public void set_visible (bool visible); public weak bool blinking { get; set; } [NoAccessorMethod] - public weak bool embedded { get; set; } + public weak bool embedded { get; } [NoAccessorMethod] - public weak string file { get; set; } + public weak string file { set; } [NoAccessorMethod] public weak string icon_name { get; set; } [NoAccessorMethod] - public weak Gtk.Orientation orientation { get; set; } + public weak Gtk.Orientation orientation { get; } [NoAccessorMethod] public weak Gdk.Pixbuf pixbuf { get; set; } public weak Gdk.Screen screen { get; set; } - [NoAccessorMethod] - public weak int size { get; set; } + public weak int size { get; } [NoAccessorMethod] public weak string stock { get; set; } - [NoAccessorMethod] - public weak Gtk.ImageType storage_type { get; set; } + public weak Gtk.ImageType storage_type { get; } public weak bool visible { get; set; } public signal void activate (); public signal void popup_menu (uint button, uint activate_time); @@ -5493,16 +5484,13 @@ namespace Gtk { public void set_text (string text, int len); public void unregister_deserialize_format (Gdk.Atom format); public void unregister_serialize_format (Gdk.Atom format); + public weak Gtk.TargetList copy_target_list { get; } [NoAccessorMethod] - public weak Gtk.TargetList copy_target_list { get; set; } - [NoAccessorMethod] - public weak int cursor_position { get; set; } - [NoAccessorMethod] - public weak bool has_selection { get; set; } - [NoAccessorMethod] - public weak Gtk.TargetList paste_target_list { get; set; } + public weak int cursor_position { get; } + public weak bool has_selection { get; } + public weak Gtk.TargetList paste_target_list { get; } [NoAccessorMethod] - public weak Gtk.TextTagTable tag_table { get; set; } + public weak Gtk.TextTagTable tag_table { get; construct; } public weak string text { get; set; } [HasEmitter] public signal void apply_tag (Gtk.TextTag tag, out Gtk.TextIter start_char, out Gtk.TextIter end_char); @@ -5541,9 +5529,9 @@ namespace Gtk { public TextMark (string name, bool left_gravity); public void set_visible (bool setting); [NoAccessorMethod] - public weak bool left_gravity { get; set; } + public weak bool left_gravity { get; construct; } [NoAccessorMethod] - public weak string name { get; set; } + public weak string name { get; construct; } } [CCode (cheader_filename = "gtk/gtk.h")] public class TextTag : GLib.Object { @@ -5563,7 +5551,7 @@ namespace Gtk { [NoAccessorMethod] public weak bool accumulative_margin { get; set; } [NoAccessorMethod] - public weak string background { get; set; } + public weak string background { set; } [NoAccessorMethod] public weak bool background_full_height { get; set; } [NoAccessorMethod] @@ -5591,7 +5579,7 @@ namespace Gtk { [NoAccessorMethod] public weak Pango.FontDescription font_desc { get; set; } [NoAccessorMethod] - public weak string foreground { get; set; } + public weak string foreground { set; } [NoAccessorMethod] public weak Gdk.Color foreground_gdk { get; set; } [NoAccessorMethod] @@ -5621,9 +5609,9 @@ namespace Gtk { [NoAccessorMethod] public weak bool left_margin_set { get; set; } [NoAccessorMethod] - public weak string name { get; set; } + public weak string name { get; construct; } [NoAccessorMethod] - public weak string paragraph_background { get; set; } + public weak string paragraph_background { set; } [NoAccessorMethod] public weak Gdk.Color paragraph_background_gdk { get; set; } [NoAccessorMethod] @@ -6051,9 +6039,9 @@ namespace Gtk { public void set_visible_column (int column); public void set_visible_func (Gtk.TreeModelFilterVisibleFunc func, pointer data, Gtk.DestroyNotify destroy); [NoAccessorMethod] - public weak Gtk.TreeModel child_model { get; set; } + public weak Gtk.TreeModel child_model { get; construct; } [NoAccessorMethod] - public weak Gtk.TreePath virtual_root { get; set; } + public weak Gtk.TreePath virtual_root { get; construct; } } [CCode (cheader_filename = "gtk/gtk.h")] public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource { @@ -6083,7 +6071,7 @@ namespace Gtk { public TreeModelSort.with_model (Gtk.TreeModel child_model); public void reset_default_sort_func (); [NoAccessorMethod] - public weak Gtk.TreeModel model { get; set; } + public weak Gtk.TreeModel model { get; construct; } } [CCode (cheader_filename = "gtk/gtk.h")] public class TreeSelection : GLib.Object { @@ -6387,8 +6375,7 @@ namespace Gtk { public weak string title { get; set; } public weak bool visible { get; set; } public weak Gtk.Widget widget { get; set; } - [NoAccessorMethod] - public weak int width { get; set; } + public weak int width { get; } [HasEmitter] public signal void clicked (); } @@ -6412,8 +6399,7 @@ namespace Gtk { public void remove_ui (uint merge_id); public void set_add_tearoffs (bool add_tearoffs); public weak bool add_tearoffs { get; set; } - [NoAccessorMethod] - public weak string ui { get; set; } + public weak string ui { get; } public signal void actions_changed (); public signal void add_widget (Gtk.Widget widget); public signal void connect_proxy (Gtk.Action action, Gtk.Widget proxy); @@ -6465,9 +6451,9 @@ namespace Gtk { public void set_hadjustment (Gtk.Adjustment adjustment); public void set_shadow_type (Gtk.ShadowType type); public void set_vadjustment (Gtk.Adjustment adjustment); - public weak Gtk.Adjustment hadjustment { get; set; } + public weak Gtk.Adjustment hadjustment { get; set construct; } public weak Gtk.ShadowType shadow_type { get; set; } - public weak Gtk.Adjustment vadjustment { get; set; } + public weak Gtk.Adjustment vadjustment { get; set construct; } public signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -6613,11 +6599,11 @@ namespace Gtk { public weak bool focus_on_map { get; set; } public weak Gdk.Gravity gravity { get; set; } [NoAccessorMethod] - public weak bool has_toplevel_focus { get; set; } + public weak bool has_toplevel_focus { get; } public weak Gdk.Pixbuf icon { get; set; } public weak string icon_name { get; set; } [NoAccessorMethod] - public weak bool is_active { get; set; } + public weak bool is_active { get; } public weak bool modal { get; set; } public weak double opacity { get; set; } public weak bool resizable { get; set; } @@ -6625,12 +6611,11 @@ namespace Gtk { public weak Gdk.Screen screen { get; set; } public weak bool skip_pager_hint { get; set; } public weak bool skip_taskbar_hint { get; set; } - [NoAccessorMethod] - public weak string startup_id { get; set; } + public weak string startup_id { set; } public weak string title { get; set; } - public weak Gtk.Window transient_for { get; set; } + public weak Gtk.Window transient_for { get; set construct; } [NoAccessorMethod] - public weak Gtk.WindowType type { get; set; } + public weak Gtk.WindowType type { get; construct; } public weak Gdk.WindowTypeHint type_hint { get; set; } public weak bool urgency_hint { get; set; } [NoAccessorMethod] diff --git a/vapi/packages/atk/atk.gi b/vapi/packages/atk/atk.gi index 985dd14c1..f5c62eff8 100644 --- a/vapi/packages/atk/atk.gi +++ b/vapi/packages/atk/atk.gi @@ -481,10 +481,10 @@ - - - - + + + + @@ -743,21 +743,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -1038,8 +1038,8 @@ - - + + diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi index 952f02d10..86a646340 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0.gi +++ b/vapi/packages/gdk-2.0/gdk-2.0.gi @@ -3427,7 +3427,7 @@ - + @@ -4256,7 +4256,7 @@ - + @@ -4725,14 +4725,14 @@ - - - - - - - - + + + + + + + + @@ -5233,8 +5233,8 @@ - - + + diff --git a/vapi/packages/gio-2.0/gio-2.0.gi b/vapi/packages/gio-2.0/gio-2.0.gi index a80e745af..756b58a72 100644 --- a/vapi/packages/gio-2.0/gio-2.0.gi +++ b/vapi/packages/gio-2.0/gio-2.0.gi @@ -650,7 +650,7 @@ - + @@ -720,7 +720,7 @@ - + @@ -1898,7 +1898,7 @@ - + @@ -1908,7 +1908,7 @@ - + @@ -2195,9 +2195,9 @@ - - - + + + diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.gi b/vapi/packages/gtk+-2.0/gtk+-2.0.gi index 835078d05..c4d7594e1 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.gi +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.gi @@ -6058,20 +6058,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -6221,8 +6221,8 @@ - - + + @@ -6506,20 +6506,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -6720,9 +6720,9 @@ - - - + + + @@ -6806,12 +6806,12 @@ - - - - - - + + + + + + @@ -6875,14 +6875,14 @@ - - - - - - - - + + + + + + + + @@ -6908,8 +6908,8 @@ - - + + @@ -6938,10 +6938,10 @@ - - - - + + + + @@ -7248,8 +7248,8 @@ - - + + @@ -7346,7 +7346,7 @@ - + @@ -7518,15 +7518,15 @@ - - - - - - - - - + + + + + + + + + @@ -7641,7 +7641,7 @@ - + @@ -8151,14 +8151,14 @@ - - - - - - - - + + + + + + + + @@ -8795,13 +8795,13 @@ - - - - - - - + + + + + + + @@ -8941,13 +8941,13 @@ - - - - - - - + + + + + + + @@ -9087,20 +9087,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -9181,10 +9181,10 @@ - - - - + + + + @@ -9214,9 +9214,9 @@ - - - + + + @@ -9226,14 +9226,14 @@ - - - - - - - - + + + + + + + + @@ -9242,20 +9242,20 @@ - - - - - - + + + + + + - - - + + + @@ -9268,50 +9268,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9370,11 +9370,11 @@ - - - - - + + + + + @@ -9454,10 +9454,10 @@ - - - - + + + + @@ -9559,9 +9559,9 @@ - - - + + + @@ -9842,10 +9842,10 @@ - - - - + + + + @@ -9995,10 +9995,10 @@ - - - - + + + + @@ -10080,11 +10080,11 @@ - - - - - + + + + + @@ -10305,16 +10305,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -10380,7 +10380,7 @@ - + @@ -10627,9 +10627,9 @@ - - - + + + @@ -10760,11 +10760,11 @@ - - - - - + + + + + @@ -10889,7 +10889,7 @@ - + @@ -11148,21 +11148,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -11440,14 +11440,14 @@ - - - - - - - - + + + + + + + + @@ -11513,8 +11513,8 @@ - - + + @@ -11611,12 +11611,12 @@ - - - - - - + + + + + + @@ -11690,10 +11690,10 @@ - - - - + + + + @@ -11871,9 +11871,9 @@ - - - + + + @@ -12030,12 +12030,12 @@ - - - - - - + + + + + + @@ -12083,9 +12083,9 @@ - - - + + + @@ -12219,12 +12219,12 @@ - - - - - - + + + + + + @@ -12399,11 +12399,11 @@ - - - - - + + + + + @@ -13247,20 +13247,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -13536,18 +13536,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -13593,7 +13593,7 @@ - + @@ -13655,7 +13655,7 @@ - + @@ -14180,24 +14180,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -14324,10 +14324,10 @@ - - - - + + + + @@ -14386,7 +14386,7 @@ - + @@ -14562,7 +14562,7 @@ - + @@ -15026,8 +15026,8 @@ - - + + @@ -15098,8 +15098,8 @@ - - + + @@ -15192,7 +15192,7 @@ - + @@ -15312,7 +15312,7 @@ - + @@ -15446,7 +15446,7 @@ - + @@ -15507,13 +15507,13 @@ - - - - - - - + + + + + + + @@ -15554,10 +15554,10 @@ - - - - + + + + @@ -15913,18 +15913,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -16198,7 +16198,7 @@ - + @@ -16243,8 +16243,8 @@ - - + + @@ -16413,7 +16413,7 @@ - + @@ -16659,10 +16659,10 @@ - - - - + + + + @@ -16805,7 +16805,7 @@ - + @@ -16917,7 +16917,7 @@ - + @@ -17135,20 +17135,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -17768,10 +17768,10 @@ - - - - + + + + @@ -17919,16 +17919,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -17981,9 +17981,9 @@ - - - + + + @@ -18050,7 +18050,7 @@ - + @@ -18117,7 +18117,7 @@ - + @@ -18170,7 +18170,7 @@ - + @@ -18310,14 +18310,14 @@ - - - - - - - - + + + + + + + + @@ -18479,7 +18479,7 @@ - + @@ -18533,7 +18533,7 @@ - + @@ -18741,9 +18741,9 @@ - - - + + + @@ -18801,11 +18801,11 @@ - - - - - + + + + + @@ -18887,9 +18887,9 @@ - - - + + + @@ -18963,10 +18963,10 @@ - - - - + + + + @@ -19100,13 +19100,13 @@ - - - - - - - + + + + + + + @@ -19168,7 +19168,7 @@ - + @@ -19228,51 +19228,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -19334,8 +19334,8 @@ - - + + @@ -19574,14 +19574,14 @@ - - - - - - - - + + + + + + + + @@ -19787,17 +19787,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -19871,7 +19871,7 @@ - + @@ -20530,11 +20530,11 @@ - - - - - + + + + + @@ -21131,12 +21131,12 @@ - - - - - - + + + + + + @@ -21299,8 +21299,8 @@ - - + + @@ -21332,71 +21332,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -21918,20 +21918,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -22126,10 +22126,10 @@ - - - - + + + + @@ -22214,8 +22214,8 @@ - - + + @@ -22288,9 +22288,9 @@ - - - + + + @@ -22328,7 +22328,7 @@ - + @@ -22432,12 +22432,12 @@ - - - - - - + + + + + + @@ -22605,9 +22605,9 @@ - - - + + + @@ -22911,12 +22911,12 @@ - - - - - - + + + + + + @@ -23153,8 +23153,8 @@ - - + + @@ -23223,7 +23223,7 @@ - + @@ -24341,25 +24341,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -24826,22 +24826,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -25006,8 +25006,8 @@ - - + + @@ -25216,9 +25216,9 @@ - - - + + + @@ -26207,27 +26207,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -27419,34 +27419,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -28390,17 +28390,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -28718,16 +28718,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/vapi/packages/pango/pango.gi b/vapi/packages/pango/pango.gi index f8cd27b12..f7b5836ee 100644 --- a/vapi/packages/pango/pango.gi +++ b/vapi/packages/pango/pango.gi @@ -127,19 +127,6 @@ - - - - - - - - - - - - - @@ -601,35 +588,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/pango.vapi b/vapi/pango.vapi index 4811fc30c..ef5dcc083 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -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);