From 9284e0820112342dc9c30bf3b75876ce65fac278 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Wed, 27 Sep 2006 08:32:23 +0000 Subject: [PATCH] fix global methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2006-09-27 Jürg Billeter * vapi/atk.vala, vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala, vapi/pango.vala: fix global methods svn path=/trunk/; revision=127 --- vala/ChangeLog | 5 ++ vala/vapi/atk.vala | 63 +++++++++--------- vala/vapi/gdk-2.0.vala | 107 +++++++++++++++-------------- vala/vapi/gtk+-2.0.vala | 174 +++++++++++++++++++++++------------------------- vala/vapi/pango.vala | 91 ++++++++++++------------- 5 files changed, 215 insertions(+), 225 deletions(-) diff --git a/vala/ChangeLog b/vala/ChangeLog index 46edecf..817ed3d 100644 --- a/vala/ChangeLog +++ b/vala/ChangeLog @@ -1,3 +1,8 @@ +2006-09-27 Jürg Billeter + + * vapi/atk.vala, vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala, vapi/pango.vala: + fix global methods + 2006-09-26 Jürg Billeter * vapi/glib-2.0.vala: add string.reverse, Source.remove, diff --git a/vala/vapi/atk.vala b/vala/vapi/atk.vala index 9b808e5..290e1a9 100644 --- a/vala/vapi/atk.vala +++ b/vala/vapi/atk.vala @@ -543,39 +543,6 @@ namespace Atk { public weak int height; } [ReferenceType ()] - public struct Global { - [NoArrayLength ()] - public static uint _add_focus_tracker (Atk.EventListener focus_tracker); - [NoArrayLength ()] - public static uint _add_global_event_listener (GLib.SignalEmissionHook listener, string event_type); - [NoArrayLength ()] - public static uint _add_key_event_listener (Atk.KeySnoopFunc listener, pointer data); - [NoArrayLength ()] - public Atk.Registry _get_default_registry (); - [NoArrayLength ()] - public Atk.Object _get_focus_object (); - [NoArrayLength ()] - public Atk.Object _get_root (); - [NoArrayLength ()] - public string _get_toolkit_name (); - [NoArrayLength ()] - public string _get_toolkit_version (); - [NoArrayLength ()] - public static void _remove_focus_tracker (uint tracker_id); - [NoArrayLength ()] - public static void _remove_global_event_listener (uint listener_id); - [NoArrayLength ()] - public static void _remove_key_event_listener (uint listener_id); - [NoArrayLength ()] - public static Atk.Role _role_for_name (string name); - [NoArrayLength ()] - public static string _role_get_localized_name (Atk.Role role); - [NoArrayLength ()] - public static string _role_get_name (Atk.Role role); - [NoArrayLength ()] - public static Atk.Role _role_register (string name); - } - [ReferenceType ()] public struct Focus { [NoArrayLength ()] public static void tracker_init (Atk.EventListenerInit init); @@ -827,4 +794,34 @@ namespace Atk { public callback bool Function (pointer data); public callback int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data); public callback void PropertyChangeHandler (Atk.Object arg1, Atk.PropertyValues arg2); + [NoArrayLength ()] + public static uint add_focus_tracker (Atk.EventListener focus_tracker); + [NoArrayLength ()] + public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type); + [NoArrayLength ()] + public static uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data); + [NoArrayLength ()] + public static Atk.Registry get_default_registry (); + [NoArrayLength ()] + public static Atk.Object get_focus_object (); + [NoArrayLength ()] + public static Atk.Object get_root (); + [NoArrayLength ()] + public static string get_toolkit_name (); + [NoArrayLength ()] + public static string get_toolkit_version (); + [NoArrayLength ()] + public static void remove_focus_tracker (uint tracker_id); + [NoArrayLength ()] + public static void remove_global_event_listener (uint listener_id); + [NoArrayLength ()] + public static void remove_key_event_listener (uint listener_id); + [NoArrayLength ()] + public static Atk.Role role_for_name (string name); + [NoArrayLength ()] + public static string role_get_localized_name (Atk.Role role); + [NoArrayLength ()] + public static string role_get_name (Atk.Role role); + [NoArrayLength ()] + public static Atk.Role role_register (string name); } diff --git a/vala/vapi/gdk-2.0.vala b/vala/vapi/gdk-2.0.vala index 9a59981..c5efcb1 100644 --- a/vala/vapi/gdk-2.0.vala +++ b/vala/vapi/gdk-2.0.vala @@ -1435,61 +1435,6 @@ namespace Gdk { public string name (); } [ReferenceType ()] - public struct Global { - [NoArrayLength ()] - public static void _add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data); - [NoArrayLength ()] - public static void _add_option_entries_libgtk_only (GLib.OptionGroup group); - [NoArrayLength ()] - public GLib.List _devices_list (); - [NoArrayLength ()] - public bool _events_pending (); - [NoArrayLength ()] - public static void _free_compound_text (uchar ctext); - [NoArrayLength ()] - public static void _free_text_list (string list); - [NoArrayLength ()] - public Gdk.Window _get_default_root_window (); - [NoArrayLength ()] - public string _get_display (); - [NoArrayLength ()] - public string _get_display_arg_name (); - [NoArrayLength ()] - public string _get_program_class (); - [NoArrayLength ()] - public bool _get_show_events (); - [NoArrayLength ()] - public static bool _init_check (int argc, string argv); - [NoArrayLength ()] - public GLib.List _list_visuals (); - [NoArrayLength ()] - public void _notify_startup_complete (); - [NoArrayLength ()] - public static void _parse_args (int argc, string argv); - [NoArrayLength ()] - public void _pre_parse_libgtk_only (); - [NoArrayLength ()] - public static void _set_double_click_time (uint msec); - [NoArrayLength ()] - public string _set_locale (); - [NoArrayLength ()] - public static Gdk.PointerHooks _set_pointer_hooks (Gdk.PointerHooks new_hooks); - [NoArrayLength ()] - public static void _set_program_class (string program_class); - [NoArrayLength ()] - public static void _set_show_events (bool show_events); - [NoArrayLength ()] - public static void _set_sm_client_id (string sm_client_id); - [NoArrayLength ()] - public static bool _setting_get (string name, GLib.Value value); - [NoArrayLength ()] - public static int _string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar ctext, int length); - [NoArrayLength ()] - public static int _string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar ctext, int length); - [NoArrayLength ()] - public static uint _unicode_to_keyval (uint wc); - } - [ReferenceType ()] public struct Cairo { [NoArrayLength ()] public static Cairo.Context create (Gdk.Drawable drawable); @@ -2317,4 +2262,56 @@ namespace Gdk { public callback bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data); public callback void SpanFunc (Gdk.Span span, pointer data); public callback bool invalidate_maybe_recurseChildFunc (Gdk.Window arg1, pointer data); + [NoArrayLength ()] + public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data); + [NoArrayLength ()] + public static void add_option_entries_libgtk_only (GLib.OptionGroup group); + [NoArrayLength ()] + public static GLib.List devices_list (); + [NoArrayLength ()] + public static bool events_pending (); + [NoArrayLength ()] + public static void free_compound_text (uchar ctext); + [NoArrayLength ()] + public static void free_text_list (string list); + [NoArrayLength ()] + public static Gdk.Window get_default_root_window (); + [NoArrayLength ()] + public static string get_display (); + [NoArrayLength ()] + public static string get_display_arg_name (); + [NoArrayLength ()] + public static string get_program_class (); + [NoArrayLength ()] + public static bool get_show_events (); + [NoArrayLength ()] + public static bool init_check (int argc, string argv); + [NoArrayLength ()] + public static GLib.List list_visuals (); + [NoArrayLength ()] + public static void notify_startup_complete (); + [NoArrayLength ()] + public static void parse_args (int argc, string argv); + [NoArrayLength ()] + public static void pre_parse_libgtk_only (); + [NoArrayLength ()] + public static void set_double_click_time (uint msec); + [NoArrayLength ()] + public static string set_locale (); + [NoArrayLength ()] + public static Gdk.PointerHooks set_pointer_hooks (Gdk.PointerHooks new_hooks); + [NoArrayLength ()] + public static void set_program_class (string program_class); + [NoArrayLength ()] + public static void set_show_events (bool show_events); + [NoArrayLength ()] + public static void set_sm_client_id (string sm_client_id); + [NoArrayLength ()] + public static bool setting_get (string name, GLib.Value value); + [NoArrayLength ()] + public static int string_to_compound_text (string str, Gdk.Atom encoding, int format, uchar ctext, int length); + [NoArrayLength ()] + public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar ctext, int length); + [NoArrayLength ()] + public static uint unicode_to_keyval (uint wc); } diff --git a/vala/vapi/gtk+-2.0.vala b/vala/vapi/gtk+-2.0.vala index 24dabbb..3bfa960 100644 --- a/vala/vapi/gtk+-2.0.vala +++ b/vala/vapi/gtk+-2.0.vala @@ -6082,7 +6082,6 @@ namespace Gtk { public weak Gdk.ModifierType accel_mods; public weak uint accel_flags; } - [ReferenceType ()] public struct ActionEntry { public weak string name; public weak string stock_id; @@ -6386,7 +6385,6 @@ namespace Gtk { [NoArrayLength ()] public pointer to_win32 (); } - [ReferenceType ()] public struct RadioActionEntry { public weak string name; public weak string stock_id; @@ -6850,7 +6848,6 @@ namespace Gtk { [ReferenceType ()] public struct ThemeEngine { } - [ReferenceType ()] public struct ToggleActionEntry { public weak string name; public weak string stock_id; @@ -6982,93 +6979,6 @@ namespace Gtk { public static bool valid (uint keyval, Gdk.ModifierType modifiers); } [ReferenceType ()] - public struct Global { - [NoArrayLength ()] - public static bool _alternative_dialog_button_order (Gdk.Screen screen); - [NoArrayLength ()] - public static uint _binding_parse_binding (GLib.Scanner scanner); - [NoArrayLength ()] - public GLib.Type _cell_type_get_type (); - [NoArrayLength ()] - public static string _check_version (uint required_major, uint required_minor, uint required_micro); - [NoArrayLength ()] - public GLib.Type _clist_drag_pos_get_type (); - [NoArrayLength ()] - public void _disable_setlocale (); - [NoArrayLength ()] - public static void _enumerate_printers (Gtk.PrinterFunc func, pointer data, GLib.DestroyNotify destroy, bool wait); - [NoArrayLength ()] - public bool _events_pending (); - [NoArrayLength ()] - public Gdk.Event _get_current_event (); - [NoArrayLength ()] - public static bool _get_current_event_state (Gdk.ModifierType state); - [NoArrayLength ()] - public uint _get_current_event_time (); - [NoArrayLength ()] - public Pango.Language _get_default_language (); - [NoArrayLength ()] - public static Gtk.Widget _get_event_widget (Gdk.Event event); - [NoArrayLength ()] - public static GLib.OptionGroup _get_option_group (bool open_default_display); - [NoArrayLength ()] - public GLib.Type _identifier_get_type (); - [NoArrayLength ()] - public static void _paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width); - [NoArrayLength ()] - public static void _paint_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style); - [NoArrayLength ()] - public static void _paint_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side); - [NoArrayLength ()] - public static void _paint_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_focus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation); - [NoArrayLength ()] - public static void _paint_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y); - [NoArrayLength ()] - public static void _paint_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout); - [NoArrayLength ()] - public static void _paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point points, int npoints, bool fill); - [NoArrayLength ()] - public static void _paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width); - [NoArrayLength ()] - public static void _paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation); - [NoArrayLength ()] - public static void _paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); - [NoArrayLength ()] - public static void _paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x); - [NoArrayLength ()] - public static bool _parse_args (int argc, string argv); - [NoArrayLength ()] - public GLib.Type _private_flags_get_type (); - [NoArrayLength ()] - public static void _propagate_event (Gtk.Widget widget, Gdk.Event event); - [NoArrayLength ()] - public static void _rgb_to_hsv (double r, double g, double b, double h, double s, double v); - [NoArrayLength ()] - public string _set_locale (); - [NoArrayLength ()] - public static void _show_about_dialog (Gtk.Window parent, string first_property_name); - [NoArrayLength ()] - public static void _text_layout_draw (pointer layout, Gtk.Widget widget, Gdk.Drawable drawable, Gdk.GC cursor_gc, int x_offset, int y_offset, int x, int y, int width, int height, GLib.List widgets); - } - [ReferenceType ()] public struct Bindings { [NoArrayLength ()] public static bool activate (Gtk.Object object, uint keyval, Gdk.ModifierType modifiers); @@ -8390,6 +8300,90 @@ namespace Gtk { public const string STOCK_ZOOM_FIT; public const string STOCK_ZOOM_IN; public const string STOCK_ZOOM_OUT; + [NoArrayLength ()] + public static bool alternative_dialog_button_order (Gdk.Screen screen); + [NoArrayLength ()] + public static uint binding_parse_binding (GLib.Scanner scanner); + [NoArrayLength ()] + public static GLib.Type cell_type_get_type (); + [NoArrayLength ()] + public static string check_version (uint required_major, uint required_minor, uint required_micro); + [NoArrayLength ()] + public static GLib.Type clist_drag_pos_get_type (); + [NoArrayLength ()] + public static void disable_setlocale (); + [NoArrayLength ()] + public static void enumerate_printers (Gtk.PrinterFunc func, pointer data, GLib.DestroyNotify destroy, bool wait); + [NoArrayLength ()] + public static bool events_pending (); + [NoArrayLength ()] + public static Gdk.Event get_current_event (); + [NoArrayLength ()] + public static bool get_current_event_state (Gdk.ModifierType state); + [NoArrayLength ()] + public static uint get_current_event_time (); + [NoArrayLength ()] + public static Pango.Language get_default_language (); + [NoArrayLength ()] + public static Gtk.Widget get_event_widget (Gdk.Event event); + [NoArrayLength ()] + public static GLib.OptionGroup get_option_group (bool open_default_display); + [NoArrayLength ()] + public static GLib.Type identifier_get_type (); + [NoArrayLength ()] + public static void paint_arrow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_box_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width); + [NoArrayLength ()] + public static void paint_check (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_diamond (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_expander (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Gtk.ExpanderStyle expander_style); + [NoArrayLength ()] + public static void paint_extension (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side); + [NoArrayLength ()] + public static void paint_flat_box (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_focus (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_handle (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation); + [NoArrayLength ()] + public static void paint_hline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x1, int x2, int y); + [NoArrayLength ()] + public static void paint_layout (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, bool use_text, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, Pango.Layout layout); + [NoArrayLength ()] + public static void paint_option (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_polygon (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.Point points, int npoints, bool fill); + [NoArrayLength ()] + public static void paint_resize_grip (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gdk.WindowEdge edge, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_shadow (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_shadow_gap (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.PositionType gap_side, int gap_x, int gap_width); + [NoArrayLength ()] + public static void paint_slider (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height, Gtk.Orientation orientation); + [NoArrayLength ()] + public static void paint_tab (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int x, int y, int width, int height); + [NoArrayLength ()] + public static void paint_vline (Gtk.Style style, Gdk.Window window, Gtk.StateType state_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, int y1_, int y2_, int x); + [NoArrayLength ()] + public static bool parse_args (int argc, string argv); + [NoArrayLength ()] + public static GLib.Type private_flags_get_type (); + [NoArrayLength ()] + public static void propagate_event (Gtk.Widget widget, Gdk.Event event); + [NoArrayLength ()] + public static void rgb_to_hsv (double r, double g, double b, double h, double s, double v); + [NoArrayLength ()] + public static string set_locale (); + [NoArrayLength ()] + public static void show_about_dialog (Gtk.Window parent, string first_property_name); + [NoArrayLength ()] + public static void text_layout_draw (pointer layout, Gtk.Widget widget, Gdk.Drawable drawable, Gdk.GC cursor_gc, int x_offset, int y_offset, int x, int y, int width, int height, GLib.List widgets); } [CCode (cheader_filename = "gtk/gtk.h")] namespace Gtk { diff --git a/vala/vapi/pango.vala b/vala/vapi/pango.vala index 0548d3b..9fcd996 100644 --- a/vala/vapi/pango.vala +++ b/vala/vapi/pango.vala @@ -719,53 +719,6 @@ namespace Pango { [NoArrayLength ()] public static Pango.Attribute weight_new (Pango.Weight weight); } - [ReferenceType ()] - public struct Global { - [NoArrayLength ()] - public static Pango.Direction _find_base_dir (string text, int length); - [NoArrayLength ()] - public static void _find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start); - [NoArrayLength ()] - public static void _get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr log_attrs, int attrs_len); - [NoArrayLength ()] - public static bool _is_zero_width (unichar ch); - [NoArrayLength ()] - public static GLib.List _itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter); - [NoArrayLength ()] - public static bool _parse_markup (string markup_text, int length, unichar accel_marker, Pango.AttrList attr_list, string text, unichar accel_char, GLib.Error error); - [NoArrayLength ()] - public static bool _parse_stretch (string str, Pango.Stretch stretch, bool warn); - [NoArrayLength ()] - public static bool _parse_style (string str, Pango.Style style, bool warn); - [NoArrayLength ()] - public static bool _parse_variant (string str, Pango.Variant variant, bool warn); - [NoArrayLength ()] - public static bool _parse_weight (string str, Pango.Weight weight, bool warn); - [NoArrayLength ()] - public static void _quantize_line_geometry (int thickness, int position); - [NoArrayLength ()] - public static int _read_line (GLib.File stream, GLib.String str); - [NoArrayLength ()] - public static GLib.List _reorder_items (GLib.List logical_items); - [NoArrayLength ()] - public static bool _scan_int (string pos, int @out); - [NoArrayLength ()] - public static bool _scan_string (string pos, GLib.String @out); - [NoArrayLength ()] - public static bool _scan_word (string pos, GLib.String @out); - [NoArrayLength ()] - public static Pango.Script _script_for_unichar (unichar ch); - [NoArrayLength ()] - public static Pango.Language _script_get_sample_language (Pango.Script script); - [NoArrayLength ()] - public static bool _skip_space (string pos); - [NoArrayLength ()] - public static string _split_file_list (string str); - [NoArrayLength ()] - public static string _trim_string (string str); - [NoArrayLength ()] - public static Pango.Direction _unichar_direction (unichar ch); - } [CCode (cprefix = "PANGO_ALIGN_")] public enum Alignment { LEFT, @@ -961,4 +914,48 @@ namespace Pango { public callback pointer AttrDataCopyFunc (pointer data); public callback bool AttrFilterFunc (Pango.Attribute attribute, pointer data); public callback bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font, pointer data); + [NoArrayLength ()] + public static Pango.Direction find_base_dir (string text, int length); + [NoArrayLength ()] + public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start); + [NoArrayLength ()] + public static void get_log_attrs (string text, int length, int level, Pango.Language language, Pango.LogAttr log_attrs, int attrs_len); + [NoArrayLength ()] + public static bool is_zero_width (unichar ch); + [NoArrayLength ()] + public static GLib.List itemize_with_base_dir (Pango.Context context, Pango.Direction base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator cached_iter); + [NoArrayLength ()] + public static bool parse_markup (string markup_text, int length, unichar accel_marker, Pango.AttrList attr_list, string text, unichar accel_char, GLib.Error error); + [NoArrayLength ()] + public static bool parse_stretch (string str, Pango.Stretch stretch, bool warn); + [NoArrayLength ()] + public static bool parse_style (string str, Pango.Style style, bool warn); + [NoArrayLength ()] + public static bool parse_variant (string str, Pango.Variant variant, bool warn); + [NoArrayLength ()] + public static bool parse_weight (string str, Pango.Weight weight, bool warn); + [NoArrayLength ()] + public static void quantize_line_geometry (int thickness, int position); + [NoArrayLength ()] + public static int read_line (GLib.File stream, GLib.String str); + [NoArrayLength ()] + public static GLib.List reorder_items (GLib.List logical_items); + [NoArrayLength ()] + public static bool scan_int (string pos, int @out); + [NoArrayLength ()] + public static bool scan_string (string pos, GLib.String @out); + [NoArrayLength ()] + public static bool scan_word (string pos, GLib.String @out); + [NoArrayLength ()] + public static Pango.Script script_for_unichar (unichar ch); + [NoArrayLength ()] + public static Pango.Language script_get_sample_language (Pango.Script script); + [NoArrayLength ()] + public static bool skip_space (string pos); + [NoArrayLength ()] + public static string split_file_list (string str); + [NoArrayLength ()] + public static string trim_string (string str); + [NoArrayLength ()] + public static Pango.Direction unichar_direction (unichar ch); } -- 2.7.4