From: Jürg Billeter Date: Mon, 25 Oct 2010 14:27:29 +0000 (+0200) Subject: gtk+-3.0: Update to GTK+ master X-Git-Tag: 0.11.1~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f774233bebd9a1fca8fc225d84638f4bc882ce99;p=thirdparty%2Fvala.git gtk+-3.0: Update to GTK+ master --- diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index c580793c9..b8c845d7b 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -34,20 +34,6 @@ namespace Gdk { } [CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")] public class Bitmap { - public weak GLib.Object parent_instance; - public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height); - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class Colormap : GLib.Object { - [CCode (has_construct_function = false)] - public Colormap (Gdk.Visual visual, bool allocate); - public bool alloc_color (Gdk.Color color, bool writeable, bool best_match); - public int alloc_colors (Gdk.Color[] colors, bool writeable, bool best_match, bool success); - public void free_colors (Gdk.Color[] colors); - public unowned Gdk.Screen get_screen (); - public static unowned Gdk.Colormap get_system (); - public unowned Gdk.Visual get_visual (); - public void query_color (ulong pixel, out Gdk.Color _result); } [Compact] [CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", type_id = "GDK_TYPE_CURSOR", cheader_filename = "gdk/gdk.h")] @@ -60,8 +46,7 @@ namespace Gdk { public Cursor.from_name (Gdk.Display display, string name); [CCode (has_construct_function = false)] public Cursor.from_pixbuf (Gdk.Display display, Gdk.Pixbuf pixbuf, int x, int y); - [CCode (has_construct_function = false)] - public Cursor.from_pixmap (Gdk.Pixmap source, Gdk.Pixmap mask, Gdk.Color fg, Gdk.Color bg, int x, int y); + public Gdk.CursorType get_cursor_type (); public unowned Gdk.Display get_display (); public unowned Gdk.Pixbuf get_image (); } @@ -110,6 +95,7 @@ namespace Gdk { public class DeviceManager : GLib.Object { [CCode (has_construct_function = false)] protected DeviceManager (); + public virtual unowned Gdk.Device get_client_pointer (); public unowned Gdk.Display get_display (); public virtual unowned GLib.List list_devices (Gdk.DeviceType type); public Gdk.Display display { get; construct; } @@ -142,6 +128,7 @@ namespace Gdk { public virtual unowned Gdk.Screen get_screen (int screen_num); public unowned Gdk.Window get_window_at_device_position (Gdk.Device device, int win_x, int win_y); public unowned Gdk.Window get_window_at_pointer (int win_x, int win_y); + public bool is_closed (); public void keyboard_ungrab (uint32 time_); public static unowned Gdk.Display open (string display_name); public static unowned Gdk.Display open_default_libgtk_only (); @@ -209,57 +196,14 @@ namespace Gdk { public class Drawable : GLib.Object { [CCode (has_construct_function = false)] protected Drawable (); - public unowned Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height); [NoWrapper] public virtual unowned Cairo.Surface create_cairo_surface (int width, int height); - [NoWrapper] - public virtual unowned Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask); - [CCode (cname = "gdk_draw_arc")] - public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2); - [CCode (cname = "gdk_draw_drawable")] - public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cname = "gdk_draw_glyphs")] - public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cname = "gdk_draw_glyphs_transformed")] - public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cname = "gdk_draw_image")] - public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cname = "gdk_draw_lines")] - public virtual void draw_lines (Gdk.GC gc, Gdk.Point[] points); - [CCode (cname = "gdk_draw_pixbuf")] - public virtual void draw_pixbuf (Gdk.GC? gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither); - [CCode (cname = "gdk_draw_points")] - public virtual void draw_points (Gdk.GC gc, Gdk.Point[] points); - [CCode (cname = "gdk_draw_polygon")] - public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point[] points); - [CCode (cname = "gdk_draw_rectangle")] - public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height); - [CCode (cname = "gdk_draw_segments")] - public virtual void draw_segments (Gdk.GC gc, Gdk.Segment[] segs); - [CCode (cname = "gdk_draw_text")] - public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length); - [CCode (cname = "gdk_draw_text_wc")] - public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length); - [CCode (cname = "gdk_draw_trapezoids")] - public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids); - public virtual unowned Gdk.Region get_clip_region (); - public virtual unowned Gdk.Colormap get_colormap (); - [NoWrapper] - public virtual unowned Gdk.Drawable get_composite_drawable (int x, int y, int width, int height, int composite_x_offset, int composite_y_offset); - public virtual int get_depth (); - public unowned Gdk.Display get_display (); - public virtual unowned Gdk.Image get_image (int x, int y, int width, int height); - public virtual unowned Gdk.Screen get_screen (); - public virtual void get_size (out int width, out int height); - [NoWrapper] - public virtual unowned Gdk.Drawable get_source_drawable (); - public virtual unowned Gdk.Region get_visible_region (); - public virtual unowned Gdk.Visual get_visual (); + public virtual unowned Cairo.Region get_clip_region (); + public virtual unowned Cairo.Region get_visible_region (); [NoWrapper] public virtual unowned Cairo.Surface ref_cairo_surface (); [NoWrapper] public virtual void set_cairo_clip (Cairo.Context cr); - public virtual void set_colormap (Gdk.Colormap colormap); } [Compact] [CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")] @@ -307,66 +251,6 @@ namespace Gdk { public void set_screen (Gdk.Screen screen); } [Compact] - [CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", type_id = "GDK_TYPE_FONT", cheader_filename = "gdk/gdk.h")] - public class Font { - public int ascent; - public int descent; - public Gdk.FontType type; - public bool equal (Gdk.Font fontb); - public static unowned Gdk.Font from_description_for_display (Gdk.Display display, Pango.FontDescription font_desc); - public int id (); - public static unowned Gdk.Font load_for_display (Gdk.Display display, string font_name); - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class GC : GLib.Object { - [CCode (has_construct_function = false)] - public GC (Gdk.Drawable drawable); - public void copy (Gdk.GC src_gc); - public unowned Gdk.Colormap get_colormap (); - public unowned Gdk.Screen get_screen (); - public virtual void get_values (out Gdk.GCValues values); - public void offset (int x_offset, int y_offset); - public void set_background (Gdk.Color color); - public void set_clip_mask (Gdk.Bitmap mask); - public void set_clip_origin (int x, int y); - public void set_clip_rectangle (Gdk.Rectangle rectangle); - public void set_clip_region (Gdk.Region region); - public void set_colormap (Gdk.Colormap colormap); - public virtual void set_dashes (int dash_offset, char[] dash_list, int n); - public void set_exposures (bool exposures); - public void set_fill (Gdk.Fill fill); - public void set_foreground (Gdk.Color color); - public void set_function (Gdk.Function function); - public void set_line_attributes (int line_width, Gdk.LineStyle line_style, Gdk.CapStyle cap_style, Gdk.JoinStyle join_style); - public void set_rgb_bg_color (Gdk.Color color); - public void set_rgb_fg_color (Gdk.Color color); - public void set_stipple (Gdk.Pixmap stipple); - public void set_subwindow (Gdk.SubwindowMode mode); - public void set_tile (Gdk.Pixmap tile); - public void set_ts_origin (int x, int y); - public virtual void set_values (Gdk.GCValues values, Gdk.GCValuesMask values_mask); - [CCode (has_construct_function = false)] - public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask); - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class Image : GLib.Object { - [CCode (has_construct_function = false)] - public Image (Gdk.ImageType type, Gdk.Visual visual, int width, int height); - public uint16 get_bits_per_pixel (); - public Gdk.ByteOrder get_byte_order (); - public uint16 get_bytes_per_line (); - public uint16 get_bytes_per_pixel (); - public unowned Gdk.Colormap get_colormap (); - public uint16 get_depth (); - public int get_height (); - public Gdk.ImageType get_image_type (); - public uint32 get_pixel (int x, int y); - public unowned Gdk.Visual get_visual (); - public int get_width (); - public void put_pixel (int x, int y, uint32 pixel); - public void set_colormap (Gdk.Colormap colormap); - } - [Compact] [CCode (cheader_filename = "gdk/gdk.h")] public class KeyboardGrabInfo { public weak Gdk.Window native_window; @@ -386,6 +270,7 @@ namespace Gdk { public bool get_entries_for_keycode (uint hardware_keycode, out unowned Gdk.KeymapKey[] keys, out unowned uint[] keyvals, int n_entries); public bool get_entries_for_keyval (uint keyval, out unowned Gdk.KeymapKey[] keys); public static unowned Gdk.Keymap get_for_display (Gdk.Display display); + public bool get_num_lock_state (); public bool have_bidi_layouts (); public uint lookup_key (Gdk.KeymapKey key); public bool map_virtual_modifiers (Gdk.ModifierType state); @@ -408,33 +293,6 @@ namespace Gdk { [CCode (array_length = false)] public weak int[] button_y; } - [CCode (cheader_filename = "gdk/gdk.h")] - public class PangoRenderer : Pango.Renderer { - [CCode (type = "PangoRenderer*", has_construct_function = false)] - public PangoRenderer (Gdk.Screen screen); - public static unowned Pango.Renderer get_default (Gdk.Screen screen); - public void set_drawable (Gdk.Drawable drawable); - public void set_gc (Gdk.GC gc); - public void set_override_color (Pango.RenderPart part, Gdk.Color color); - public void set_stipple (Pango.RenderPart part, Gdk.Bitmap stipple); - [NoAccessorMethod] - public Gdk.Screen screen { owned get; construct; } - } - [CCode (cheader_filename = "gdk/gdk.h")] - public class Pixmap : Gdk.Drawable { - [CCode (has_construct_function = false)] - public Pixmap (Gdk.Drawable? drawable, int width, int height, int depth); - public static unowned Gdk.Pixmap colormap_create_from_xpm (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename); - public static unowned Gdk.Pixmap colormap_create_from_xpm_d (Gdk.Drawable drawable, Gdk.Colormap colormap, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data); - public static unowned Gdk.Pixmap create_from_data (Gdk.Drawable drawable, string data, int width, int height, int depth, Gdk.Color fg, Gdk.Color bg); - public static unowned Gdk.Pixmap create_from_xpm (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string filename); - public static unowned Gdk.Pixmap create_from_xpm_d (Gdk.Drawable drawable, out unowned Gdk.Bitmap mask, Gdk.Color transparent_color, string data); - public static unowned Gdk.Pixmap foreign_new (Gdk.NativeWindow anid); - public static unowned Gdk.Pixmap foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid); - public static unowned Gdk.Pixmap foreign_new_for_screen (Gdk.Screen screen, Gdk.NativeWindow anid, int width, int height, int depth); - public static unowned Gdk.Pixmap lookup (Gdk.NativeWindow anid); - public static unowned Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid); - } [Compact] [CCode (cheader_filename = "gdk/gdk.h")] public class PointerHooks { @@ -451,30 +309,6 @@ namespace Gdk { public double toplevel_y; public weak Gdk.Window window_under_pointer; } - [Compact] - [CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")] - public class Region { - [CCode (has_construct_function = false)] - public Region (); - public Gdk.Region copy (); - public bool empty (); - public bool equal (Gdk.Region region2); - public void get_clipbox (out Gdk.Rectangle rectangle); - public void get_rectangles (out Gdk.Rectangle[] rectangles); - public void intersect (Gdk.Region source2); - public void offset (int dx, int dy); - public bool point_in (int x, int y); - public static Gdk.Region polygon (Gdk.Point[] points, Gdk.FillRule fill_rule); - public bool rect_equal (Gdk.Rectangle rectangle); - public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle); - public static Gdk.Region rectangle (Gdk.Rectangle rectangle); - public void shrink (int dx, int dy); - public void spans_intersect_foreach (Gdk.Span[] spans, bool sorted, Gdk.SpanFunc function, void* data); - public void subtract (Gdk.Region source2); - public void union (Gdk.Region source2); - public void union_with_rect (Gdk.Rectangle rect); - public void xor (Gdk.Region source2); - } [CCode (cheader_filename = "gdk/gdk.h")] public class Screen : GLib.Object { [CCode (has_construct_function = false)] @@ -482,7 +316,6 @@ namespace Gdk { public void broadcast_client_message (Gdk.Event event); public unowned Gdk.Window get_active_window (); public static unowned Gdk.Screen get_default (); - public unowned Gdk.Colormap get_default_colormap (); public unowned Gdk.Display get_display (); public unowned Cairo.FontOptions get_font_options (); public int get_height (); @@ -497,13 +330,9 @@ namespace Gdk { public int get_number (); public int get_primary_monitor (); public double get_resolution (); - public unowned Gdk.Colormap get_rgb_colormap (); - public unowned Gdk.Visual get_rgb_visual (); - public unowned Gdk.Colormap get_rgba_colormap (); public unowned Gdk.Visual get_rgba_visual (); public unowned Gdk.Window get_root_window (); public bool get_setting (string name, GLib.Value value); - public unowned Gdk.Colormap get_system_colormap (); public unowned Gdk.Visual get_system_visual (); public GLib.List get_toplevel_windows (); public int get_width (); @@ -514,7 +343,6 @@ namespace Gdk { public bool is_composited (); public GLib.List list_visuals (); public unowned string make_display_name (); - public void set_default_colormap (Gdk.Colormap colormap); public void set_font_options (Cairo.FontOptions options); public void set_resolution (double dpi); public static int width (); @@ -555,15 +383,13 @@ namespace Gdk { public void beep (); public void begin_move_drag (int button, int root_x, int root_y, uint32 timestamp); public void begin_paint_rect (Gdk.Rectangle rectangle); - public void begin_paint_region (Gdk.Region region); + public void begin_paint_region (Cairo.Region region); public void begin_resize_drag (Gdk.WindowEdge edge, int button, int root_x, int root_y, uint32 timestamp); - public void clear (); - public void clear_area (int x, int y, int width, int height); - public void clear_area_e (int x, int y, int width, int height); public void configure_finished (); public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height); public void coords_from_parent (double parent_x, double parent_y, double x, double y); public void coords_to_parent (double x, double y, double parent_x, double parent_y); + public unowned Cairo.Surface create_similar_surface (Cairo.Content content, int width, int height); public void deiconify (); public void destroy (); public void enable_synchronized_configure (); @@ -578,16 +404,15 @@ namespace Gdk { public void fullscreen (); public void geometry_changed (); public bool get_accept_focus (); - public void get_back_pixmap (out unowned Gdk.Pixmap pixmap, bool parent_relative); - public void get_background (Gdk.Color color); + public unowned Cairo.Pattern get_background_pattern (); public GLib.List get_children (); public bool get_composited (); public unowned Gdk.Cursor? get_cursor (); public bool get_decorations (out Gdk.WMDecoration decorations); - public bool get_deskrelative_origin (out int x, out int y); public unowned Gdk.Cursor get_device_cursor (Gdk.Device device); public Gdk.EventMask get_device_events (Gdk.Device device); public unowned Gdk.Window get_device_position (Gdk.Device device, int x, int y, Gdk.ModifierType mask); + public unowned Gdk.Display get_display (); public unowned Gdk.Window get_effective_parent (); public unowned Gdk.Window get_effective_toplevel (); public Gdk.EventMask get_events (); @@ -595,7 +420,7 @@ namespace Gdk { public void get_frame_extents (out Gdk.Rectangle rect); public void get_geometry (out int x, out int y, out int width, out int height, out int depth); public unowned Gdk.Window get_group (); - public void get_internal_paint_info (out unowned Gdk.Drawable real_drawable, out int x_offset, out int y_offset); + public int get_height (); public bool get_modal_hint (); public int get_origin (out int x, out int y); public unowned Gdk.Window get_parent (); @@ -603,20 +428,23 @@ namespace Gdk { public void get_position (out int x, out int y); public void get_root_coords (int x, int y, int root_x, int root_y); public void get_root_origin (out int x, out int y); + public unowned Gdk.Screen get_screen (); public Gdk.WindowState get_state (); public bool get_support_multidevice (); public unowned Gdk.Window get_toplevel (); public Gdk.WindowTypeHint get_type_hint (); - public unowned Gdk.Region get_update_area (); + public unowned Cairo.Region get_update_area (); public void get_user_data (void* data); + public unowned Gdk.Visual get_visual (); + public int get_width (); public Gdk.WindowType get_window_type (); + public bool has_native (); public void hide (); public void iconify (); - public void input_shape_combine_mask (Gdk.Bitmap? mask, int x, int y); - public void input_shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y); - public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func); + public void input_shape_combine_region (Cairo.Region shape_region, int offset_x, int offset_y); + public void invalidate_maybe_recurse (Cairo.Region region, Gdk.WindowChildFunc child_func); public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children); - public void invalidate_region (Gdk.Region region, bool invalidate_children); + public void invalidate_region (Cairo.Region region, bool invalidate_children); public bool is_destroyed (); public bool is_input_only (); public bool is_shaped (); @@ -629,7 +457,7 @@ namespace Gdk { public void merge_child_input_shapes (); public void merge_child_shapes (); public void move (int x, int y); - public void move_region (Gdk.Region region, int dx, int dy); + public void move_region (Cairo.Region region, int dx, int dy); public void move_resize (int x, int y, int width, int height); public unowned GLib.List peek_children (); public static void process_all_updates (); @@ -637,14 +465,14 @@ namespace Gdk { public void raise (); public void register_dnd (); public void remove_filter (Gdk.FilterFunc function); - public void remove_redirection (); public void reparent (Gdk.Window new_parent, int x, int y); public void resize (int width, int height); public void restack (Gdk.Window sibling, bool above); public void scroll (int dx, int dy); public void set_accept_focus (bool accept_focus); - public void set_back_pixmap (Gdk.Pixmap? pixmap, bool parent_relative); public void set_background (Gdk.Color color); + public void set_background_pattern (Cairo.Pattern pattern); + public void set_background_rgba (Gdk.RGBA rgba); public void set_child_input_shapes (); public void set_child_shapes (); public void set_composited (bool composited); @@ -658,7 +486,6 @@ namespace Gdk { public void set_functions (Gdk.WMFunction functions); public void set_geometry_hints (Gdk.Geometry geometry, Gdk.WindowHints geom_mask); public void set_group (Gdk.Window leader); - public void set_icon (Gdk.Window icon_window, Gdk.Pixmap pixmap, Gdk.Bitmap mask); public void set_icon_list (GLib.List pixbufs); public void set_icon_name (string name); public void set_keep_above (bool setting); @@ -677,8 +504,7 @@ namespace Gdk { public void set_type_hint (Gdk.WindowTypeHint hint); public void set_urgency_hint (bool urgent); public void set_user_data (void* user_data); - public void shape_combine_mask (Gdk.Bitmap mask, int x, int y); - public void shape_combine_region (Gdk.Region shape_region, int offset_x, int offset_y); + public void shape_combine_region (Cairo.Region shape_region, int offset_x, int offset_y); public void show (); public void show_unraised (); public void stick (); @@ -689,6 +515,7 @@ namespace Gdk { public void unstick (); public void withdraw (); public Gdk.Cursor cursor { get; set; } + public virtual signal Cairo.Surface create_surface (int p0, int p1); public virtual signal void from_embedder (double p0, double p1, void* p2, void* p3); public virtual signal unowned Gdk.Window pick_embedded_child (double p0, double p1); public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3); @@ -796,7 +623,7 @@ namespace Gdk { public weak Gdk.Window window; public char send_event; public Gdk.Rectangle area; - public weak Gdk.Region region; + public weak Cairo.Region region; public int count; } [CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")] @@ -927,27 +754,6 @@ namespace Gdk { public Gdk.WindowState changed_mask; public Gdk.WindowState new_window_state; } - [CCode (type_id = "GDK_TYPE_GC_VALUES", cheader_filename = "gdk/gdk.h")] - public struct GCValues { - public Gdk.Color foreground; - public Gdk.Color background; - public weak Gdk.Font font; - public Gdk.Function function; - public Gdk.Fill fill; - public weak Gdk.Pixmap tile; - public weak Gdk.Pixmap stipple; - public weak Gdk.Pixmap clip_mask; - public Gdk.SubwindowMode subwindow_mode; - public int ts_x_origin; - public int ts_y_origin; - public int clip_x_origin; - public int clip_y_origin; - public int graphics_exposures; - public int line_width; - public Gdk.LineStyle line_style; - public Gdk.CapStyle cap_style; - public Gdk.JoinStyle join_style; - } [CCode (type_id = "GDK_TYPE_GEOMETRY", cheader_filename = "gdk/gdk.h")] public struct Geometry { public int min_width; @@ -972,82 +778,35 @@ namespace Gdk { [SimpleType] public struct NativeWindow { } - [CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR", cheader_filename = "gdk/gdk.h")] - public struct PangoAttrEmbossColor { - public weak Pango.Attribute attr; - public Pango.Color color; - [CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)] - public PangoAttrEmbossColor (Gdk.Color color); - } - [CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED", cheader_filename = "gdk/gdk.h")] - public struct PangoAttrEmbossed { - public weak Pango.Attribute attr; - public bool embossed; - [CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)] - public PangoAttrEmbossed (bool embossed); - } - [CCode (type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE", cheader_filename = "gdk/gdk.h")] - public struct PangoAttrStipple { - public weak Pango.Attribute attr; - public weak Gdk.Bitmap stipple; - [CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)] - public PangoAttrStipple (Gdk.Bitmap stipple); - } [CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")] public struct Point { public int x; public int y; } + [CCode (type_id = "GDK_TYPE_RGBA", cheader_filename = "gdk/gdk.h")] + public struct RGBA { + public double red; + public double green; + public double blue; + public double alpha; + public Gdk.RGBA copy (); + public static bool equal (void* p1, void* p2); + public void free (); + public static uint hash (void* p); + public static bool parse (string spec, Gdk.RGBA rgba); + public unowned string to_string (); + } [CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")] public struct Rectangle { - public int x; - public int y; - public int width; - public int height; public bool intersect (Gdk.Rectangle src2, Gdk.Rectangle dest); public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest); } - [CCode (type_id = "GDK_TYPE_RGB_CMAP", cheader_filename = "gdk/gdk.h")] - public struct RgbCmap { - [CCode (array_length = false)] - public weak uint32[] colors; - public int n_colors; - public weak GLib.SList info_list; - [CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)] - public RgbCmap (uint32[] colors); - public void free (); - } - [CCode (type_id = "GDK_TYPE_SEGMENT", cheader_filename = "gdk/gdk.h")] - public struct Segment { - public int x1; - public int y1; - public int x2; - public int y2; - } - [CCode (type_id = "GDK_TYPE_SPAN", cheader_filename = "gdk/gdk.h")] - public struct Span { - public int x; - public int y; - public int width; - } [CCode (type_id = "GDK_TYPE_TIME_COORD", cheader_filename = "gdk/gdk.h")] public struct TimeCoord { public uint32 time; [CCode (array_length = false)] public weak double[] axes; } - [CCode (type_id = "GDK_TYPE_TRAPEZOID", cheader_filename = "gdk/gdk.h")] - public struct Trapezoid { - public double y1; - public double x11; - public double x21; - public double y2; - public double x12; - public double x22; - } - [CCode (type_id = "GDK_TYPE_WCHAR", cheader_filename = "gdk/gdk.h")] - public struct WChar { - } [CCode (type_id = "GDK_TYPE_WINDOW_ATTR", cheader_filename = "gdk/gdk.h")] public struct WindowAttr { public weak string title; @@ -1058,7 +817,6 @@ namespace Gdk { public int height; public Gdk.WindowClass wclass; public weak Gdk.Visual visual; - public weak Gdk.Colormap colormap; public Gdk.WindowType window_type; public weak Gdk.Cursor cursor; public weak string wmclass_name; @@ -1068,7 +826,6 @@ namespace Gdk { } [CCode (type_id = "GDK_TYPE_WINDOW_REDIRECT", cheader_filename = "gdk/gdk.h")] public struct WindowRedirect { - public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height); } [CCode (type_id = "GDK_TYPE_XEVENT", cheader_filename = "gdk/gdk.h")] public struct XEvent { @@ -1089,13 +846,6 @@ namespace Gdk { LSB_FIRST, MSB_FIRST } - [CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")] - public enum CapStyle { - NOT_LAST, - BUTT, - ROUND, - PROJECTING - } [CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")] public enum CrossingMode { NORMAL, @@ -1288,70 +1038,12 @@ namespace Gdk { ALL, CURSOR } - [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")] - public enum Fill { - SOLID, - TILED, - STIPPLED, - OPAQUE_STIPPLED - } - [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")] - public enum FillRule { - EVEN_ODD_RULE, - WINDING_RULE - } [CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")] public enum FilterReturn { CONTINUE, TRANSLATE, REMOVE } - [CCode (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")] - public enum FontType { - FONT, - FONTSET - } - [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")] - public enum Function { - COPY, - INVERT, - XOR, - CLEAR, - AND, - AND_REVERSE, - AND_INVERT, - NOOP, - OR, - EQUIV, - OR_REVERSE, - COPY_INVERT, - OR_INVERT, - NAND, - NOR, - SET - } - [CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")] - [Flags] - public enum GCValuesMask { - FOREGROUND, - BACKGROUND, - FONT, - FUNCTION, - FILL, - TILE, - STIPPLE, - CLIP_MASK, - SUBWINDOW, - TS_X_ORIGIN, - TS_Y_ORIGIN, - CLIP_X_ORIGIN, - CLIP_Y_ORIGIN, - EXPOSURES, - LINE_WIDTH, - LINE_STYLE, - CAP_STYLE, - JOIN_STYLE - } [CCode (cprefix = "GDK_OWNERSHIP_", cheader_filename = "gdk/gdk.h")] public enum GrabOwnership { NONE, @@ -1379,19 +1071,6 @@ namespace Gdk { SOUTH_EAST, STATIC } - [CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")] - public enum ImageType { - NORMAL, - SHARED, - FASTEST - } - [CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")] - [Flags] - public enum InputCondition { - READ, - WRITE, - EXCEPTION - } [CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")] public enum InputMode { DISABLED, @@ -1406,18 +1085,6 @@ namespace Gdk { CURSOR, KEYBOARD } - [CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")] - public enum JoinStyle { - MITER, - ROUND, - BEVEL - } - [CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")] - public enum LineStyle { - SOLID, - ON_OFF_DASH, - DOUBLE_DASH - } [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")] [Flags] public enum ModifierType { @@ -1449,12 +1116,6 @@ namespace Gdk { NONLINEAR_VIRTUAL, UNKNOWN } - [CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")] - public enum OverlapType { - IN, - OUT, - PART - } [CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")] public enum OwnerChange { NEW_OWNER, @@ -1472,12 +1133,6 @@ namespace Gdk { NEW_VALUE, DELETE } - [CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")] - public enum RgbDither { - NONE, - NORMAL, - MAX - } [CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")] public enum ScrollDirection { UP, @@ -1499,11 +1154,6 @@ namespace Gdk { ERROR_FILE, ERROR_MEM } - [CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")] - public enum SubwindowMode { - CLIP_BY_CHILDREN, - INCLUDE_INFERIORS - } [CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")] public enum VisibilityState { UNOBSCURED, @@ -1547,7 +1197,6 @@ namespace Gdk { X, Y, CURSOR, - COLORMAP, VISUAL, WMCLASS, NOREDIR, @@ -1598,7 +1247,6 @@ namespace Gdk { ROOT, TOPLEVEL, CHILD, - DIALOG, TEMP, FOREIGN, OFFSCREEN @@ -1624,10 +1272,8 @@ namespace Gdk { public delegate void EventFunc (Gdk.Event event); [CCode (cheader_filename = "gdk/gdk.h")] public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event); - [CCode (cheader_filename = "gdk/gdk.h", has_target = false)] - public delegate void InputFunction (void* data, int source, Gdk.InputCondition condition); [CCode (cheader_filename = "gdk/gdk.h")] - public delegate void SpanFunc (Gdk.Span span); + public delegate bool WindowChildFunc (Gdk.Window window); [CCode (cheader_filename = "gdk/gdk.h")] public const int CURRENT_TIME; [CCode (cheader_filename = "gdk/gdk.h")] @@ -1651,9 +1297,13 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static Cairo.Context cairo_create (Gdk.Drawable drawable); [CCode (cheader_filename = "gdk/gdk.h")] + public static bool cairo_get_clip_rectangle (Cairo.Context cr, Gdk.Rectangle rect); + [CCode (cheader_filename = "gdk/gdk.h")] public static void cairo_rectangle (Cairo.Context cr, Gdk.Rectangle rectangle); [CCode (cheader_filename = "gdk/gdk.h")] - public static void cairo_region (Cairo.Context cr, Gdk.Region region); + public static void cairo_region (Cairo.Context cr, Cairo.Region region); + [CCode (cheader_filename = "gdk/gdk.h")] + public static unowned Cairo.Region cairo_region_create_from_surface (Cairo.Surface surface); [CCode (cheader_filename = "gdk/gdk.h")] public static void cairo_reset_clip (Cairo.Context cr, Gdk.Drawable drawable); [CCode (cheader_filename = "gdk/gdk.h")] @@ -1661,7 +1311,9 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y); [CCode (cheader_filename = "gdk/gdk.h")] - public static void cairo_set_source_pixmap (Cairo.Context cr, Gdk.Pixmap pixmap, double pixmap_x, double pixmap_y); + public static void cairo_set_source_rgba (Cairo.Context cr, Gdk.RGBA rgba); + [CCode (cheader_filename = "gdk/gdk.h")] + public static void cairo_set_source_window (Cairo.Context cr, Gdk.Window window, double x, double y); [CCode (cheader_filename = "gdk/gdk.h")] public static void drag_abort (Gdk.DragContext context, uint32 time_); [CCode (cheader_filename = "gdk/gdk.h")] @@ -1685,58 +1337,6 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint32 time_); [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_drawable (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_glyphs (Gdk.Drawable drawable, Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_glyphs_transformed (Gdk.Drawable drawable, Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_gray_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_image (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_indexed_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, Gdk.RgbCmap cmap); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_layout_line (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_layout_line_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line, Gdk.Color foreground, Gdk.Color background); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_layout_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout, Gdk.Color foreground, Gdk.Color background); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_rgb_32_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_rgb_32_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, int xdith, int ydith); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_rgb_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride, int xdith, int ydith); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids); - [CCode (cheader_filename = "gdk/gdk.h")] public static void drop_finish (Gdk.DragContext context, bool success, uint32 time_); [CCode (cheader_filename = "gdk/gdk.h")] public static void drop_reply (Gdk.DragContext context, bool ok, uint32 time_); @@ -1745,6 +1345,8 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static int error_trap_pop (); [CCode (cheader_filename = "gdk/gdk.h")] + public static void error_trap_pop_ignored (); + [CCode (cheader_filename = "gdk/gdk.h")] public static void error_trap_push (); [CCode (cheader_filename = "gdk/gdk.h")] public static bool events_get_angle (Gdk.Event event1, Gdk.Event event2, double angle); @@ -1757,8 +1359,6 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static void flush (); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Font fontset_load_for_display (Gdk.Display display, string fontset_name); - [CCode (cheader_filename = "gdk/gdk.h")] public static void free_compound_text (uchar[] ctext); [CCode (cheader_filename = "gdk/gdk.h")] public static void free_text_list (string list); @@ -1805,7 +1405,7 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static unowned Gdk.Window? offscreen_window_get_embedder (Gdk.Window window); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Pixmap? offscreen_window_get_pixmap (Gdk.Window window); + public static unowned Cairo.Surface offscreen_window_get_surface (Gdk.Window window); [CCode (cheader_filename = "gdk/gdk.h")] public static void offscreen_window_set_embedder (Gdk.Window window, Gdk.Window embedder); [CCode (cheader_filename = "gdk/gdk.h")] @@ -1813,21 +1413,15 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdk.h")] public static unowned Pango.Context pango_context_get_for_screen (Gdk.Screen screen); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges); + public static unowned Cairo.Region pango_layout_get_clip_region (Pango.Layout layout, int x_origin, int y_origin, int index_ranges, int n_ranges); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges); + public static unowned Cairo.Region pango_layout_line_get_clip_region (Pango.LayoutLine line, int x_origin, int y_origin, int index_ranges, int n_ranges); [CCode (cheader_filename = "gdk/gdk.h")] public static void parse_args (int argc, string argv); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf? dest, Gdk.Drawable src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); + public static unowned Gdk.Pixbuf pixbuf_get_from_surface (Cairo.Surface surface, int src_x, int src_y, int width, int height); [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf? dest, Gdk.Image src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void pixbuf_render_pixmap_and_mask_for_colormap (Gdk.Pixbuf pixbuf, Gdk.Colormap colormap, out unowned Gdk.Pixmap pixmap_return, out unowned Gdk.Bitmap mask_return, int alpha_threshold); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void pixbuf_render_threshold_alpha (Gdk.Pixbuf pixbuf, Gdk.Bitmap bitmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height, int alpha_threshold); + public static unowned Gdk.Pixbuf pixbuf_get_from_window (Gdk.Window window, int src_x, int src_y, int width, int height); [CCode (cheader_filename = "gdk/gdk.h")] public static Gdk.GrabStatus pointer_grab (Gdk.Window window, bool owner_events, Gdk.EventMask event_mask, Gdk.Window? confine_to, Gdk.Cursor? cursor, uint32 time_); [CCode (cheader_filename = "gdk/gdk.h")] @@ -1846,22 +1440,6 @@ namespace Gdk { public static void query_depths (int depths, int count); [CCode (cheader_filename = "gdk/gdk.h")] public static void query_visual_types (out Gdk.VisualType visual_types, int count); - [CCode (cheader_filename = "gdk/gdk.h")] - public static bool rgb_colormap_ditherable (Gdk.Colormap cmap); - [CCode (cheader_filename = "gdk/gdk.h")] - public static bool rgb_ditherable (); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color); - [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Colormap rgb_get_colormap (); - [CCode (cheader_filename = "gdk/gdk.h")] - public static unowned Gdk.Visual rgb_get_visual (); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void rgb_set_install (bool install); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void rgb_set_min_colors (int min_colors); - [CCode (cheader_filename = "gdk/gdk.h")] - public static void rgb_set_verbose (bool verbose); [Deprecated (since = "vala-0.12", replacement = "Selection.convert")] [CCode (cheader_filename = "gdk/gdk.h")] public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_); diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi index 100661d87..1c3d3a158 100644 --- a/vapi/gdk-x11-3.0.vapi +++ b/vapi/gdk-x11-3.0.vapi @@ -7,18 +7,18 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h")] public static X.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom); [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned Gdk.Colormap x11_colormap_foreign_new (Gdk.Visual visual, X.Colormap xcolormap); - [CCode (cheader_filename = "gdk/gdkx.h")] - public static X.Colormap x11_colormap_get_xcolormap (Gdk.Colormap colormap); - [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned X.Display x11_colormap_get_xdisplay (Gdk.Colormap colormap); - [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor); [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned X.Display x11_cursor_get_xdisplay (Gdk.Cursor cursor); [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type); [CCode (cheader_filename = "gdk/gdkx.h")] + public static int x11_display_error_trap_pop (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void x11_display_error_trap_pop_ignored (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void x11_display_error_trap_push (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned string x11_display_get_startup_notification_id (Gdk.Display display); [CCode (cheader_filename = "gdk/gdkx.h")] public static uint32 x11_display_get_user_time (Gdk.Display display); @@ -29,16 +29,14 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_set_cursor_theme (Gdk.Display display, string theme, int size); [CCode (cheader_filename = "gdk/gdkx.h")] + public static void x11_display_set_startup_notification_id (Gdk.Display display, string startup_id); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_ungrab (Gdk.Display display); [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned X.Display x11_drawable_get_xdisplay (Gdk.Drawable drawable); [CCode (cheader_filename = "gdk/gdkx.h")] public static X.ID x11_drawable_get_xid (Gdk.Drawable drawable); [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned X.Display x11_gc_get_xdisplay (Gdk.GC gc); - [CCode (cheader_filename = "gdk/gdkx.h")] - public static X.GC x11_gc_get_xgc (Gdk.GC gc); - [CCode (cheader_filename = "gdk/gdkx.h")] public static X.Window x11_get_default_root_xwindow (); [CCode (cheader_filename = "gdk/gdkx.h")] public static int x11_get_default_screen (); @@ -57,16 +55,10 @@ namespace Gdk { [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_grab_server (); [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned X.Display x11_image_get_xdisplay (Gdk.Image image); - [CCode (cheader_filename = "gdk/gdkx.h")] - public static void* x11_image_get_ximage (Gdk.Image image); - [CCode (cheader_filename = "gdk/gdkx.h")] public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay); [CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")] public static bool x11_net_wm_supports (Gdk.Atom property); [CCode (cheader_filename = "gdk/gdkx.h")] - public static unowned Gdk.Drawable x11_pixmap_get_drawable_impl (Gdk.Pixmap pixmap); - [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events); [CCode (cheader_filename = "gdk/gdkx.h")] public static X.ID x11_screen_get_monitor_output (Gdk.Screen screen, int monitor_num); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index d94686d9f..33811ade1 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -503,19 +503,12 @@ namespace Gtk { public float yscale { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class Application : GLib.Application, GLib.Initable { + public class Application : GLib.Application, GLib.ActionGroup { [CCode (has_construct_function = false)] - public Application (string appid, [CCode (array_length_pos = 1.9)] ref unowned string[]? argv = null); + public Application (string application_id, GLib.ApplicationFlags flags); public void add_window (Gtk.Window window); - public virtual unowned Gtk.Window create_window (); - public unowned Gtk.Window get_window (); - public unowned GLib.SList get_windows (); - public void run (); - public void set_action_group (Gtk.ActionGroup group); - public virtual signal void action (string action_name); - public virtual signal void activated (GLib.Variant args); - [HasEmitter] - public virtual signal bool quit (); + public unowned GLib.List get_windows (); + public void remove_window (Gtk.Window window); } [Compact] [CCode (cheader_filename = "gtk/gtk.h")] @@ -812,6 +805,8 @@ namespace Gtk { [NoAccessorMethod] public Gdk.Color cell_background_gdk { get; set; } [NoAccessorMethod] + public Gdk.RGBA cell_background_rgba { get; set; } + [NoAccessorMethod] public bool cell_background_set { get; set; } [NoAccessorMethod] public bool editing { get; } @@ -944,6 +939,8 @@ namespace Gtk { [NoAccessorMethod] public Gdk.Color background_gdk { get; set; } [NoAccessorMethod] + public Gdk.RGBA background_rgba { get; set; } + [NoAccessorMethod] public bool background_set { get; set; } [NoAccessorMethod] public bool editable { get; set; } @@ -966,6 +963,8 @@ namespace Gtk { [NoAccessorMethod] public Gdk.Color foreground_gdk { get; set; } [NoAccessorMethod] + public Gdk.RGBA foreground_rgba { get; set; } + [NoAccessorMethod] public bool foreground_set { get; set; } [NoAccessorMethod] public string language { owned get; set; } @@ -1053,6 +1052,7 @@ namespace Gtk { public unowned Gtk.TreePath get_displayed_row (); public unowned Gtk.TreeModel get_model (); public void set_background_color (Gdk.Color color); + public void set_background_rgba (Gdk.RGBA rgba); public void set_displayed_row (Gtk.TreePath path); public void set_model (Gtk.TreeModel? model); [CCode (type = "GtkWidget*", has_construct_function = false)] @@ -1066,6 +1066,8 @@ namespace Gtk { [NoAccessorMethod] public Gdk.Color background_gdk { get; set; } [NoAccessorMethod] + public Gdk.RGBA background_rgba { get; set; } + [NoAccessorMethod] public bool background_set { get; set; } public Gtk.TreeModel model { get; set; } } @@ -1142,16 +1144,21 @@ namespace Gtk { public ColorButton (); public uint16 get_alpha (); public void get_color (out Gdk.Color color); + public void get_rgba (Gdk.RGBA rgba); public unowned string get_title (); public bool get_use_alpha (); public void set_alpha (uint16 alpha); public void set_color (Gdk.Color color); + public void set_rgba (Gdk.RGBA rgba); public void set_title (string title); public void set_use_alpha (bool use_alpha); [CCode (type = "GtkWidget*", has_construct_function = false)] public ColorButton.with_color (Gdk.Color color); + [CCode (type = "GtkWidget*", has_construct_function = false)] + public ColorButton.with_rgba (Gdk.RGBA rgba); public uint alpha { get; set; } public Gdk.Color color { get; set; } + public Gdk.RGBA rgba { get; set; } public string title { get; set; } public bool use_alpha { get; set; } public virtual signal void color_set (); @@ -1162,22 +1169,27 @@ namespace Gtk { public ColorSelection (); public uint16 get_current_alpha (); public void get_current_color (out Gdk.Color color); + public void get_current_rgba (Gdk.RGBA rgba); public bool get_has_opacity_control (); public bool get_has_palette (); public uint16 get_previous_alpha (); public void get_previous_color (out Gdk.Color color); + public void get_previous_rgba (Gdk.RGBA rgba); public bool is_adjusting (); public static bool palette_from_string (string str, Gdk.Color[] colors); public static unowned string palette_to_string (Gdk.Color[] colors); public static unowned Gtk.ColorSelectionChangePaletteWithScreenFunc set_change_palette_with_screen_hook (Gtk.ColorSelectionChangePaletteWithScreenFunc func); public void set_current_alpha (uint16 alpha); public void set_current_color (Gdk.Color color); + public void set_current_rgba (Gdk.RGBA rgba); public void set_has_opacity_control (bool has_opacity); public void set_has_palette (bool has_palette); public void set_previous_alpha (uint16 alpha); public void set_previous_color (Gdk.Color color); + public void set_previous_rgba (Gdk.RGBA rgba); public uint current_alpha { get; set; } public Gdk.Color current_color { get; set; } + public Gdk.RGBA current_rgba { get; set; } public bool has_opacity_control { get; set; } public bool has_palette { get; set; } public virtual signal void color_changed (); @@ -1199,47 +1211,50 @@ namespace Gtk { public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable { [CCode (type = "GtkWidget*", has_construct_function = false)] public ComboBox (); - public void append_text (string text); public int get_active (); public bool get_active_iter (out Gtk.TreeIter iter); - public virtual unowned string get_active_text (); public bool get_add_tearoffs (); public Gtk.SensitivityType get_button_sensitivity (); public int get_column_span_column (); + public int get_entry_text_column (); public bool get_focus_on_click (); + public bool get_has_entry (); public unowned Gtk.TreeModel get_model (); public unowned Atk.Object get_popup_accessible (); + public bool get_popup_fixed_width (); public unowned Gtk.TreeViewRowSeparatorFunc get_row_separator_func (); public int get_row_span_column (); public unowned string get_title (); public int get_wrap_width (); - public void insert_text (int position, string text); public void popup_for_device (Gdk.Device device); - public void prepend_text (string text); - public void remove_text (int position); public void set_active (int index_); public void set_active_iter (Gtk.TreeIter iter); public void set_add_tearoffs (bool add_tearoffs); public void set_button_sensitivity (Gtk.SensitivityType sensitivity); public void set_column_span_column (int column_span); + public void set_entry_text_column (int text_column); public void set_focus_on_click (bool focus_on_click); public void set_model (Gtk.TreeModel? model); + public void set_popup_fixed_width (bool fixed); public void set_row_separator_func (owned Gtk.TreeViewRowSeparatorFunc func); public void set_row_span_column (int row_span); public void set_title (string title); public void set_wrap_width (int width); [CCode (type = "GtkWidget*", has_construct_function = false)] - public ComboBox.text (); + public ComboBox.with_entry (); [CCode (type = "GtkWidget*", has_construct_function = false)] public ComboBox.with_model (Gtk.TreeModel model); public int active { get; set; } public bool add_tearoffs { get; set; } public Gtk.SensitivityType button_sensitivity { get; set; } public int column_span_column { get; set; } + public int entry_text_column { get; set; } public bool focus_on_click { get; set; } + public bool has_entry { get; construct; } [NoAccessorMethod] public bool has_frame { get; set; } public Gtk.TreeModel model { get; set; } + public bool popup_fixed_width { get; set; } [NoAccessorMethod] public bool popup_shown { get; } public int row_span_column { get; set; } @@ -1254,16 +1269,17 @@ namespace Gtk { public virtual signal void popup (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable { - [CCode (type = "GtkWidget*", has_construct_function = false)] - public ComboBoxEntry (); - public int get_text_column (); - public void set_text_column (int text_column); + public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable { [CCode (type = "GtkWidget*", has_construct_function = false)] - public ComboBoxEntry.text (); + public ComboBoxText (); + public void append_text (string text); + public unowned string get_active_text (); + public void insert_text (int position, string text); + public void prepend_text (string text); + public void remove (int position); + public void remove_all (); [CCode (type = "GtkWidget*", has_construct_function = false)] - public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column); - public int text_column { get; set; } + public ComboBoxText.with_entry (); } [CCode (cheader_filename = "gtk/gtk.h")] public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable { @@ -1362,6 +1378,7 @@ namespace Gtk { public unowned Gtk.Adjustment get_cursor_hadjustment (); public bool get_has_frame (); public bool get_icon_activatable (Gtk.EntryIconPosition icon_pos); + public void get_icon_area (Gtk.EntryIconPosition icon_pos, Gdk.Rectangle icon_area); public int get_icon_at_pos (int x, int y); public unowned GLib.Icon get_icon_gicon (Gtk.EntryIconPosition icon_pos); public unowned string get_icon_name (Gtk.EntryIconPosition icon_pos); @@ -1371,7 +1388,6 @@ namespace Gtk { public Gtk.ImageType get_icon_storage_type (Gtk.EntryIconPosition icon_pos); public unowned string get_icon_tooltip_markup (Gtk.EntryIconPosition icon_pos); public unowned string get_icon_tooltip_text (Gtk.EntryIconPosition icon_pos); - public unowned Gdk.Window get_icon_window (Gtk.EntryIconPosition icon_pos); public unowned Gtk.Border get_inner_border (); public unichar get_invisible_char (); public unowned Pango.Layout get_layout (); @@ -1381,10 +1397,10 @@ namespace Gtk { public double get_progress_fraction (); public double get_progress_pulse_step (); public unowned string get_text (); + public void get_text_area (Gdk.Rectangle text_area); [NoWrapper] public virtual void get_text_area_size (int x, int y, int width, int height); public uint16 get_text_length (); - public unowned Gdk.Window get_text_window (); public bool get_visibility (); public int get_width_chars (); public bool im_context_filter_keypress (Gdk.EventKey event); @@ -1747,6 +1763,25 @@ namespace Gtk { public Gtk.ShadowType shadow_type { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] + public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { + [CCode (type = "GtkWidget*", has_construct_function = false)] + public Grid (); + public void attach (Gtk.Widget child, int left, int top, int width, int height); + public void attach_next_to (Gtk.Widget child, Gtk.Widget sibling, Gtk.PositionType side, int width, int height); + public bool get_column_homogeneous (); + public uint get_column_spacing (); + public bool get_row_homogeneous (); + public uint get_row_spacing (); + public void set_column_homogeneous (bool homogeneous); + public void set_column_spacing (uint spacing); + public void set_row_homogeneous (bool homogeneous); + public void set_row_spacing (uint spacing); + public bool column_homogeneous { get; set; } + public int column_spacing { get; set; } + public bool row_homogeneous { get; set; } + public int row_spacing { get; set; } + } + [CCode (cheader_filename = "gtk/gtk.h")] public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { [CCode (type = "GtkWidget*", has_construct_function = false)] public HBox (bool homogeneous, int spacing); @@ -1874,7 +1909,7 @@ namespace Gtk { public bool get_embedded_rect (out Gdk.Rectangle rectangle); public unowned string get_filename (); public Gdk.Pixbuf load_icon () throws GLib.Error; - public unowned Gdk.Pixbuf load_symbolic (Gdk.Color fg, Gdk.Color success_color, Gdk.Color warning_color, Gdk.Color error_color, bool was_symbolic) throws GLib.Error; + public unowned Gdk.Pixbuf load_symbolic (Gdk.RGBA fg, Gdk.RGBA success_color, Gdk.RGBA warning_color, Gdk.RGBA error_color, bool was_symbolic) throws GLib.Error; public unowned Gdk.Pixbuf load_symbolic_for_style (Gtk.Style style, Gtk.StateType state, bool was_symbolic) throws GLib.Error; public void set_raw_coordinates (bool raw_coordinates); } @@ -1942,7 +1977,7 @@ namespace Gtk { public virtual signal void changed (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout { + public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public IconView (); public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by); @@ -2024,7 +2059,6 @@ namespace Gtk { public virtual signal void select_all (); public virtual signal void select_cursor_item (); public virtual signal void selection_changed (); - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); public virtual signal void toggle_cursor_item (); public virtual signal void unselect_all (); } @@ -2252,25 +2286,18 @@ namespace Gtk { public class LabelSelectionInfo { } [CCode (cheader_filename = "gtk/gtk.h")] - public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable { + public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); public unowned Gdk.Window get_bin_window (); - public unowned Gtk.Adjustment get_hadjustment (); public void get_size (out uint width, out uint height); - public unowned Gtk.Adjustment get_vadjustment (); public void move (Gtk.Widget child_widget, int x, int y); public void put (Gtk.Widget child_widget, int x, int y); - public void set_hadjustment (Gtk.Adjustment adjustment); public void set_size (uint width, uint height); - public void set_vadjustment (Gtk.Adjustment adjustment); - public Gtk.Adjustment hadjustment { get; set; } [NoAccessorMethod] public uint height { get; set; } - public Gtk.Adjustment vadjustment { get; set; } [NoAccessorMethod] public uint width { get; set; } - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); } [CCode (cheader_filename = "gtk/gtk.h")] public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { @@ -2284,6 +2311,7 @@ namespace Gtk { public LinkButton.with_label (string uri, string label); public string uri { get; set; } public bool visited { get; set; } + public virtual signal bool activate_link (); } [CCode (cheader_filename = "gtk/gtk.h")] public class ListStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable, Gtk.Buildable { @@ -2556,9 +2584,9 @@ namespace Gtk { public virtual signal unowned Gtk.Notebook create_window (Gtk.Widget page, int x, int y); public virtual signal bool focus_tab (Gtk.NotebookTab type); public virtual signal void move_focus_out (Gtk.DirectionType direction); - public virtual signal void page_added (Gtk.Widget p0, uint p1); - public virtual signal void page_removed (Gtk.Widget p0, uint p1); - public virtual signal void page_reordered (Gtk.Widget p0, uint p1); + public virtual signal void page_added (Gtk.Widget child, uint page_num); + public virtual signal void page_removed (Gtk.Widget child, uint page_num); + public virtual signal void page_reordered (Gtk.Widget child, uint page_num); public virtual signal bool reorder_tab (Gtk.DirectionType direction, bool move_to_last); public virtual signal bool select_page (bool move_focus); public virtual signal void switch_page (Gtk.Widget page, uint page_num); @@ -3109,6 +3137,7 @@ namespace Gtk { [Compact] [CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", type_id = "GTK_TYPE_RECENT_INFO", cheader_filename = "gtk/gtk.h")] public class RecentInfo { + public unowned GLib.AppInfo create_app_info (string app_name) throws GLib.Error; public bool exists (); public ulong get_added (); public int get_age (); @@ -3117,6 +3146,7 @@ namespace Gtk { public string[] get_applications (); public unowned string get_description (); public unowned string get_display_name (); + public unowned GLib.Icon get_gicon (); [CCode (array_length_type = "gsize")] public string[] get_groups (); public Gdk.Pixbuf? get_icon (int size); @@ -3249,12 +3279,16 @@ namespace Gtk { public void add_with_viewport (Gtk.Widget child); public unowned Gtk.Adjustment get_hadjustment (); public unowned Gtk.Widget get_hscrollbar (); + public int get_min_content_height (); + public int get_min_content_width (); public Gtk.CornerType get_placement (); public void get_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy); public Gtk.ShadowType get_shadow_type (); public unowned Gtk.Adjustment get_vadjustment (); public unowned Gtk.Widget get_vscrollbar (); public void set_hadjustment (Gtk.Adjustment hadjustment); + public void set_min_content_height (int height); + public void set_min_content_width (int width); public void set_placement (Gtk.CornerType window_placement); public void set_policy (Gtk.PolicyType hscrollbar_policy, Gtk.PolicyType vscrollbar_policy); public void set_shadow_type (Gtk.ShadowType type); @@ -3263,6 +3297,8 @@ namespace Gtk { public Gtk.Adjustment hadjustment { get; set construct; } [NoAccessorMethod] public Gtk.PolicyType hscrollbar_policy { get; set; } + public int min_content_height { get; set; } + public int min_content_width { get; set; } public Gtk.ShadowType shadow_type { get; set; } public Gtk.Adjustment vadjustment { get; set construct; } [NoAccessorMethod] @@ -3341,6 +3377,12 @@ namespace Gtk { [NoAccessorMethod] public bool gtk_auto_mnemonics { get; set; } [NoAccessorMethod] + public bool gtk_button_images { get; set; } + [NoAccessorMethod] + public bool gtk_can_change_accels { get; set; } + [NoAccessorMethod] + public string gtk_color_palette { owned get; set; } + [NoAccessorMethod] public string gtk_color_scheme { owned get; set; } [NoAccessorMethod] public bool gtk_cursor_blink { get; set; } @@ -3371,6 +3413,10 @@ namespace Gtk { [NoAccessorMethod] public bool gtk_enable_tooltips { get; set; } [NoAccessorMethod] + public uint gtk_entry_password_hint_timeout { get; set; } + [NoAccessorMethod] + public bool gtk_entry_select_on_focus { get; set; } + [NoAccessorMethod] public bool gtk_error_bell { get; set; } [NoAccessorMethod] public string gtk_fallback_icon_theme { owned get; set; } @@ -3387,14 +3433,28 @@ namespace Gtk { [NoAccessorMethod] public string gtk_im_module { owned get; set; } [NoAccessorMethod] + public Gtk.IMPreeditStyle gtk_im_preedit_style { get; set; } + [NoAccessorMethod] + public Gtk.IMStatusStyle gtk_im_status_style { get; set; } + [NoAccessorMethod] public string gtk_key_theme_name { owned get; set; } [NoAccessorMethod] public bool gtk_keynav_cursor_only { get; set; } [NoAccessorMethod] public bool gtk_keynav_wrap_around { get; set; } [NoAccessorMethod] + public bool gtk_label_select_on_focus { get; set; } + [NoAccessorMethod] public string gtk_menu_bar_accel { owned get; set; } [NoAccessorMethod] + public int gtk_menu_bar_popup_delay { get; set; } + [NoAccessorMethod] + public bool gtk_menu_images { get; set; } + [NoAccessorMethod] + public int gtk_menu_popdown_delay { get; set; } + [NoAccessorMethod] + public int gtk_menu_popup_delay { get; set; } + [NoAccessorMethod] public string gtk_modules { owned get; set; } [NoAccessorMethod] public string gtk_print_backends { owned get; set; } @@ -3405,6 +3465,8 @@ namespace Gtk { [NoAccessorMethod] public int gtk_recent_files_max_age { get; set; } [NoAccessorMethod] + public Gtk.CornerType gtk_scrolled_window_placement { get; set; } + [NoAccessorMethod] public bool gtk_show_input_method_menu { get; set; } [NoAccessorMethod] public bool gtk_show_unicode_menu { get; set; } @@ -3467,25 +3529,6 @@ namespace Gtk { public bool ignore_hidden { get; set; } public Gtk.SizeGroupMode mode { get; set; } } - [Compact] - [CCode (cheader_filename = "gtk/gtk.h")] - public class SizeRequest { - public int for_size; - public int minimum_size; - public int natural_size; - } - [Compact] - [CCode (cheader_filename = "gtk/gtk.h")] - public class SizeRequestCache { - public uint cached_heights; - public uint cached_widths; - [CCode (array_length = false)] - public weak Gtk.SizeRequest[] heights; - public uint last_cached_height; - public uint last_cached_width; - [CCode (array_length = false)] - public weak Gtk.SizeRequest[] widths; - } [CCode (cheader_filename = "gtk/gtk.h")] public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable { [CCode (type = "GtkWidget*", has_construct_function = false)] @@ -3626,14 +3669,11 @@ namespace Gtk { [CCode (type = "GtkWidget*", has_construct_function = false)] public Statusbar (); public uint get_context_id (string context_description); - public bool get_has_resize_grip (); public unowned Gtk.Widget get_message_area (); public void pop (uint context_id); public uint push (uint context_id, string text); public void remove (uint context_id, uint message_id); public void remove_all (uint context_id); - public void set_has_resize_grip (bool setting); - public bool has_resize_grip { get; set; } public virtual signal void text_popped (uint context_id, string text); public virtual signal void text_pushed (uint context_id, string text); } @@ -4128,7 +4168,7 @@ namespace Gtk { public virtual signal void tag_removed (Gtk.TextTag tag); } [CCode (cheader_filename = "gtk/gtk.h")] - public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable { + public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public TextView (); public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor); @@ -4144,7 +4184,6 @@ namespace Gtk { public bool get_cursor_visible (); public unowned Gtk.TextAttributes get_default_attributes (); public bool get_editable (); - public unowned Gtk.Adjustment get_hadjustment (); public int get_indent (); public void get_iter_at_location (out Gtk.TextIter iter, int x, int y); public void get_iter_at_position (out Gtk.TextIter iter, out int trailing, int x, int y); @@ -4159,15 +4198,12 @@ namespace Gtk { public int get_pixels_inside_wrap (); public int get_right_margin (); public unowned Pango.TabArray get_tabs (); - public unowned Gtk.Adjustment get_vadjustment (); public void get_visible_rect (out Gdk.Rectangle visible_rect); public unowned Gdk.Window get_window (Gtk.TextWindowType win); public Gtk.TextWindowType get_window_type (Gdk.Window window); public Gtk.WrapMode get_wrap_mode (); public bool im_context_filter_keypress (Gdk.EventKey event); public void move_child (Gtk.Widget child, int xpos, int ypos); - [NoWrapper] - public virtual void move_focus (Gtk.DirectionType direction); public bool move_mark_onscreen (Gtk.TextMark mark); public bool move_visually (Gtk.TextIter iter, int count); public bool place_cursor_onscreen (); @@ -4222,7 +4258,6 @@ namespace Gtk { public virtual signal void preedit_changed (string p0); public virtual signal void select_all (bool p0); public virtual signal void set_anchor (); - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); public virtual signal void toggle_cursor_visible (); public virtual signal void toggle_overwrite (); } @@ -4364,7 +4399,7 @@ namespace Gtk { public Gtk.Widget label_widget { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { + public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public ToolPalette (); public void add_drag_dest (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.ToolPaletteDragTargets targets, Gdk.DragAction actions); @@ -4372,10 +4407,8 @@ namespace Gtk { public static Gtk.TargetEntry get_drag_target_group (); public static Gtk.TargetEntry get_drag_target_item (); public unowned Gtk.ToolItem get_drop_item (int x, int y); - public unowned Gtk.Adjustment get_hadjustment (); public Gtk.IconSize get_icon_size (); public Gtk.ToolbarStyle get_style (); - public unowned Gtk.Adjustment get_vadjustment (); public void set_drag_source (Gtk.ToolPaletteDragTargets targets); public void set_icon_size (Gtk.IconSize icon_size); public void set_style (Gtk.ToolbarStyle style); @@ -4386,7 +4419,6 @@ namespace Gtk { public bool icon_size_set { get; set; } [NoAccessorMethod] public Gtk.ToolbarStyle toolbar_style { get; set; } - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); } [CCode (cheader_filename = "gtk/gtk.h")] public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell, Gtk.Orientable { @@ -4568,7 +4600,7 @@ namespace Gtk { public void swap (Gtk.TreeIter a, Gtk.TreeIter b); } [CCode (cheader_filename = "gtk/gtk.h")] - public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable { + public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public TreeView (); public int append_column (Gtk.TreeViewColumn column); @@ -4600,7 +4632,6 @@ namespace Gtk { public unowned Gtk.TreeViewColumn get_expander_column (); public bool get_fixed_height_mode (); public Gtk.TreeViewGridLines get_grid_lines (); - public unowned Gtk.Adjustment get_hadjustment (); public bool get_headers_clickable (); public bool get_headers_visible (); public bool get_hover_expand (); @@ -4620,7 +4651,6 @@ namespace Gtk { public bool get_show_expanders (); public int get_tooltip_column (); public bool get_tooltip_context (out int x, out int y, bool keyboard_tip, out unowned Gtk.TreeModel model, out unowned Gtk.TreePath path, out Gtk.TreeIter iter); - public unowned Gtk.Adjustment get_vadjustment (); public bool get_visible_range (out unowned Gtk.TreePath start_path, out unowned Gtk.TreePath end_path); public void get_visible_rect (out Gdk.Rectangle visible_rect); public int insert_column (Gtk.TreeViewColumn column, int position); @@ -4644,7 +4674,6 @@ namespace Gtk { public void set_expander_column (Gtk.TreeViewColumn column); public void set_fixed_height_mode (bool enable); public void set_grid_lines (Gtk.TreeViewGridLines grid_lines); - public void set_hadjustment (Gtk.Adjustment adjustment); public void set_headers_clickable (bool setting); public void set_headers_visible (bool headers_visible); public void set_hover_expand (bool expand); @@ -4663,7 +4692,6 @@ namespace Gtk { public void set_tooltip_cell (Gtk.Tooltip tooltip, Gtk.TreePath path, Gtk.TreeViewColumn column, Gtk.CellRenderer cell); public void set_tooltip_column (int column); public void set_tooltip_row (Gtk.Tooltip tooltip, Gtk.TreePath path); - public void set_vadjustment (Gtk.Adjustment adjustment); public void unset_rows_drag_dest (); public void unset_rows_drag_source (); [CCode (type = "GtkWidget*", has_construct_function = false)] @@ -4674,7 +4702,6 @@ namespace Gtk { public bool enable_tree_lines { get; set; } public Gtk.TreeViewColumn expander_column { get; set; } public bool fixed_height_mode { get; set; } - public Gtk.Adjustment hadjustment { get; set; } public bool headers_clickable { get; set; } public bool headers_visible { get; set; } public bool hover_expand { get; set; } @@ -4687,7 +4714,6 @@ namespace Gtk { public int search_column { get; set; } public bool show_expanders { get; set; } public int tooltip_column { get; set; } - public Gtk.Adjustment vadjustment { get; set; } public virtual signal void columns_changed (); public virtual signal void cursor_changed (); public virtual signal bool expand_collapse_cursor_row (bool logical, bool expand, bool open_all); @@ -4699,7 +4725,6 @@ namespace Gtk { public virtual signal bool select_all (); public virtual signal bool select_cursor_parent (); public virtual signal bool select_cursor_row (bool start_editing); - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); public virtual signal bool start_interactive_search (); public virtual signal bool test_collapse_row (Gtk.TreeIter iter, Gtk.TreePath path); public virtual signal bool test_expand_row (Gtk.TreeIter iter, Gtk.TreePath path); @@ -4840,21 +4865,14 @@ namespace Gtk { public VSeparator (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable { + public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable { [CCode (type = "GtkWidget*", has_construct_function = false)] public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment); public unowned Gdk.Window get_bin_window (); - public unowned Gtk.Adjustment get_hadjustment (); public Gtk.ShadowType get_shadow_type (); - public unowned Gtk.Adjustment get_vadjustment (); public unowned Gdk.Window get_view_window (); - public void set_hadjustment (Gtk.Adjustment adjustment); public void set_shadow_type (Gtk.ShadowType type); - public void set_vadjustment (Gtk.Adjustment adjustment); - public Gtk.Adjustment hadjustment { get; set construct; } public Gtk.ShadowType shadow_type { get; set; } - public Gtk.Adjustment vadjustment { get; set construct; } - public virtual signal void set_scroll_adjustments (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment); } [CCode (cheader_filename = "gtk/gtk.h")] public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable { @@ -4871,11 +4889,12 @@ namespace Gtk { public void add_events (int events); public void add_mnemonic_label (Gtk.Widget label); [NoWrapper] - public virtual void adjust_size_allocation (Gtk.Allocation allocation); + public virtual void adjust_size_allocation (Gtk.Orientation orientation, int natural_size, int allocated_pos, int allocated_size); [NoWrapper] - public virtual void adjust_size_request (Gtk.Orientation orientation, int for_size, int minimum_size, int natural_size); + public virtual void adjust_size_request (Gtk.Orientation orientation, int minimum_size, int natural_size); public bool child_focus (Gtk.DirectionType direction); public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed); + public virtual void compute_expand (Gtk.Orientation orientation); public Pango.Context create_pango_context (); public Pango.Layout create_pango_layout (string? text); public void destroyed (out unowned Gtk.Widget widget_pointer); @@ -4909,6 +4928,8 @@ namespace Gtk { public Gtk.Align get_halign (); public bool get_has_tooltip (); public bool get_has_window (); + public bool get_hexpand (); + public bool get_hexpand_set (); public bool get_mapped (); public int get_margin_bottom (); public int get_margin_left (); @@ -4942,13 +4963,14 @@ namespace Gtk { public unowned Gtk.Window get_tooltip_window (); public unowned Gtk.Widget get_toplevel (); public Gtk.Align get_valign (); + public bool get_vexpand (); + public bool get_vexpand_set (); public bool get_visible (); public unowned Gdk.Visual get_visual (); public unowned Gdk.Window get_window (); public void grab_default (); public bool has_rc_style (); public bool has_screen (); - public virtual void hide_all (); public bool hide_on_delete (); public bool in_destruction (); public void input_shape_combine_region (Cairo.Region region); @@ -4976,8 +4998,10 @@ namespace Gtk { public void path (out uint path_length, out unowned string path, out unowned string path_reversed); public static void pop_composite_child (); public static void push_composite_child (); + public void queue_compute_expand (); public void queue_draw (); public void queue_draw_area (int x, int y, int width, int height); + public void queue_draw_region (Cairo.Region region); public void queue_resize (); public void queue_resize_no_redraw (); public unowned Cairo.Region region_intersect (Cairo.Region region); @@ -5005,6 +5029,8 @@ namespace Gtk { public void set_halign (Gtk.Align align); public void set_has_tooltip (bool has_tooltip); public void set_has_window (bool has_window); + public void set_hexpand (bool expand); + public void set_hexpand_set (bool @set); public void set_mapped (bool mapped); public void set_margin_bottom (int margin); public void set_margin_left (int margin); @@ -5016,7 +5042,6 @@ namespace Gtk { public void set_realized (bool realized); public void set_receives_default (bool receives_default); public void set_redraw_on_allocate (bool redraw_on_allocate); - public bool set_scroll_adjustments (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment); public void set_sensitive (bool sensitive); public void set_size_request (int width, int height); public void set_state (Gtk.StateType state); @@ -5026,6 +5051,8 @@ namespace Gtk { public void set_tooltip_text (string text); public void set_tooltip_window (Gtk.Window custom_window); public void set_valign (Gtk.Align align); + public void set_vexpand (bool expand); + public void set_vexpand_set (bool @set); public void set_visible (bool visible); public void set_visual (Gdk.Visual visual); public void set_window (Gdk.Window window); @@ -5048,6 +5075,8 @@ namespace Gtk { public bool composite_child { get; } public bool double_buffered { get; set; } public Gdk.EventMask events { get; set; } + [NoAccessorMethod] + public bool expand { get; set; } public Gdk.ExtensionMode extension_events { get; set; } public Gtk.Align halign { get; set; } [NoAccessorMethod] @@ -5057,6 +5086,8 @@ namespace Gtk { public bool has_tooltip { get; set; } [NoAccessorMethod] public int height_request { get; set; } + public bool hexpand { get; set; } + public bool hexpand_set { get; set; } [NoAccessorMethod] public bool is_focus { get; set; } [NoAccessorMethod] @@ -5074,6 +5105,8 @@ namespace Gtk { public string tooltip_markup { get; set; } public string tooltip_text { get; set; } public Gtk.Align valign { get; set; } + public bool vexpand { get; set; } + public bool vexpand_set { get; set; } public bool visible { get; set; } [NoAccessorMethod] public int width_request { get; set; } @@ -5087,7 +5120,7 @@ namespace Gtk { public virtual signal bool client_event (Gdk.EventClient event); public virtual signal void composited_changed (); public virtual signal bool configure_event (Gdk.EventConfigure event); - public virtual signal bool damage_event (Gdk.Event p0); + public virtual signal bool damage_event (Gdk.Event event); public virtual signal bool delete_event (Gdk.Event event); public virtual signal void destroy (); public virtual signal bool destroy_event (Gdk.Event event); @@ -5120,7 +5153,7 @@ namespace Gtk { public virtual signal bool key_press_event (Gdk.EventKey event); public virtual signal bool key_release_event (Gdk.EventKey event); [HasEmitter] - public virtual signal bool keynav_failed (Gtk.DirectionType p0); + public virtual signal bool keynav_failed (Gtk.DirectionType direction); public virtual signal bool leave_notify_event (Gdk.EventCrossing event); [HasEmitter] public virtual signal void map (); @@ -5128,7 +5161,7 @@ namespace Gtk { [HasEmitter] public virtual signal bool mnemonic_activate (bool group_cycling); public virtual signal bool motion_notify_event (Gdk.EventMotion event); - public virtual signal void move_focus (Gtk.DirectionType p0); + public virtual signal void move_focus (Gtk.DirectionType direction); public virtual signal bool no_expose_event (Gdk.EventNoExpose event); public virtual signal void parent_set (Gtk.Widget? previous_parent); public virtual signal bool popup_menu (); @@ -5186,6 +5219,7 @@ namespace Gtk { public void deiconify (); public void fullscreen (); public bool get_accept_focus (); + public unowned Gtk.Application get_application (); public bool get_decorated (); public static GLib.List get_default_icon_list (); public static unowned string get_default_icon_name (); @@ -5199,6 +5233,7 @@ namespace Gtk { public Gdk.Gravity get_gravity (); public unowned Gtk.WindowGroup get_group (); public bool get_has_frame (); + public bool get_has_resize_grip (); public unowned Gdk.Pixbuf get_icon (); public GLib.List get_icon_list (); public unowned string get_icon_name (); @@ -5208,6 +5243,7 @@ namespace Gtk { public double get_opacity (); public void get_position (out int root_x, out int root_y); public bool get_resizable (); + public bool get_resize_grip_area (Gdk.Rectangle rect); public unowned string get_role (); public unowned Gdk.Screen get_screen (); public void get_size (out int width, out int height); @@ -5224,8 +5260,6 @@ namespace Gtk { public void maximize (); public bool mnemonic_activate (uint keyval, Gdk.ModifierType modifier); public void move (int x, int y); - [NoWrapper] - public virtual void move_focus (Gtk.DirectionType direction); public bool parse_geometry (string geometry); public void present (); public void present_with_time (uint32 timestamp); @@ -5235,10 +5269,14 @@ namespace Gtk { public void remove_mnemonic (uint keyval, Gtk.Widget target); public void reshow_with_initial_size (); public void resize (int width, int height); + public bool resize_grip_is_visible (); + public void resize_to_geometry (int width, int height); public void set_accept_focus (bool setting); + public void set_application (Gtk.Application application); public static void set_auto_startup_notification (bool setting); public void set_decorated (bool setting); public void set_default (Gtk.Widget default_widget); + public void set_default_geometry (int width, int height); public static void set_default_icon (Gdk.Pixbuf icon); public static bool set_default_icon_from_file (string filename) throws GLib.Error; public static void set_default_icon_list (GLib.List list); @@ -5251,6 +5289,7 @@ namespace Gtk { public void set_geometry_hints (Gtk.Widget geometry_widget, Gdk.Geometry geometry, Gdk.WindowHints geom_mask); public void set_gravity (Gdk.Gravity gravity); public void set_has_frame (bool setting); + public void set_has_resize_grip (bool value); public void set_icon (Gdk.Pixbuf icon); public bool set_icon_from_file (string filename) throws GLib.Error; public void set_icon_list (GLib.List list); @@ -5278,6 +5317,7 @@ namespace Gtk { public void unmaximize (); public void unstick (); public bool accept_focus { get; set; } + public Gtk.Application application { get; set; } public bool decorated { get; set; } [NoAccessorMethod] public int default_height { get; set; } @@ -5287,6 +5327,7 @@ namespace Gtk { public bool destroy_with_parent { get; set; } public bool focus_on_map { get; set; } public Gdk.Gravity gravity { get; set; } + public bool has_resize_grip { get; set; } [NoAccessorMethod] public bool has_toplevel_focus { get; } public Gdk.Pixbuf icon { get; set; } @@ -5297,6 +5338,8 @@ namespace Gtk { public bool modal { get; set; } public double opacity { get; set; } public bool resizable { get; set; } + [NoAccessorMethod] + public bool resize_grip_visible { get; } public string role { get; set; } public Gdk.Screen screen { get; set; } public bool skip_pager_hint { get; set; } @@ -5332,34 +5375,6 @@ namespace Gtk { public void remove_window (Gtk.Window window); } [CCode (cheader_filename = "gtk/gtk.h")] - public class WrapBox : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable { - [CCode (type = "GtkWidget*", has_construct_function = false)] - public WrapBox (Gtk.WrapAllocationMode mode, Gtk.WrapBoxSpreading horizontal_spreading, Gtk.WrapBoxSpreading vertical_spreading, uint horizontal_spacing, uint vertical_spacing); - public Gtk.WrapAllocationMode get_allocation_mode (); - public uint get_horizontal_spacing (); - public Gtk.WrapBoxSpreading get_horizontal_spreading (); - public uint get_minimum_line_children (); - public uint get_natural_line_children (); - public uint get_vertical_spacing (); - public Gtk.WrapBoxSpreading get_vertical_spreading (); - public void insert_child (Gtk.Widget widget, int index, Gtk.WrapBoxPacking packing); - public void reorder_child (Gtk.Widget widget, uint index); - public void set_allocation_mode (Gtk.WrapAllocationMode mode); - public void set_horizontal_spacing (uint spacing); - public void set_horizontal_spreading (Gtk.WrapBoxSpreading spreading); - public void set_minimum_line_children (uint n_children); - public void set_natural_line_children (uint n_children); - public void set_vertical_spacing (uint spacing); - public void set_vertical_spreading (Gtk.WrapBoxSpreading spreading); - public Gtk.WrapAllocationMode allocation_mode { get; set; } - public uint horizontal_spacing { get; set; } - public Gtk.WrapBoxSpreading horizontal_spreading { get; set; } - public uint minimum_line_children { get; set; } - public uint natural_line_children { get; set; } - public uint vertical_spacing { get; set; } - public Gtk.WrapBoxSpreading vertical_spreading { get; set; } - } - [CCode (cheader_filename = "gtk/gtk.h")] public interface Activatable : GLib.Object { public void do_set_related_action (Gtk.Action action); public unowned Gtk.Action get_related_action (); @@ -5575,6 +5590,15 @@ namespace Gtk { public signal void selection_changed (); } [CCode (cheader_filename = "gtk/gtk.h")] + public interface Scrollable : GLib.Object { + public unowned Gtk.Adjustment get_hadjustment (); + public unowned Gtk.Adjustment get_vadjustment (); + public void set_hadjustment (Gtk.Adjustment hadjustment); + public void set_vadjustment (Gtk.Adjustment vadjustment); + public Gtk.Adjustment hadjustment { get; set construct; } + public Gtk.Adjustment vadjustment { get; set construct; } + } + [CCode (cheader_filename = "gtk/gtk.h")] public interface ToolShell : Gtk.Widget { public abstract Pango.EllipsizeMode get_ellipsize_mode (); public abstract Gtk.IconSize get_icon_size (); @@ -5655,7 +5679,7 @@ namespace Gtk { public weak string accelerator; public weak string tooltip; [CCode (type = "GCallback")] - public weak Gtk.ActionCallback callback; + public Gtk.ActionCallback callback; } [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")] public struct Allocation { @@ -5716,6 +5740,10 @@ namespace Gtk { public weak string target; public uint flags; public uint info; + [CCode (cname = "gtk_target_entry_new", has_construct_function = false)] + public TargetEntry (string target, uint flags, uint info); + public Gtk.TargetEntry copy (); + public void free (); } [CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")] public struct TextIter { @@ -5832,7 +5860,7 @@ namespace Gtk { public weak string accelerator; public weak string tooltip; [CCode (type = "GCallback")] - public weak Gtk.ActionCallback callback; + public Gtk.ActionCallback callback; public bool is_active; } [CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")] @@ -6597,25 +6625,6 @@ namespace Gtk { TOPLEVEL, POPUP } - [CCode (cprefix = "GTK_WRAP_ALLOCATE_", cheader_filename = "gtk/gtk.h")] - public enum WrapAllocationMode { - FREE, - ALIGNED, - HOMOGENEOUS - } - [CCode (cprefix = "GTK_WRAP_BOX_", cheader_filename = "gtk/gtk.h")] - [Flags] - public enum WrapBoxPacking { - H_EXPAND, - V_EXPAND - } - [CCode (cprefix = "GTK_WRAP_BOX_SPREAD_", cheader_filename = "gtk/gtk.h")] - public enum WrapBoxSpreading { - START, - END, - EVEN, - EXPAND - } [CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")] public enum WrapMode { NONE, @@ -6772,12 +6781,6 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public const string PAPER_NAME_LETTER; [CCode (cheader_filename = "gtk/gtk.h")] - public const int PARAM_READABLE; - [CCode (cheader_filename = "gtk/gtk.h")] - public const int PARAM_READWRITE; - [CCode (cheader_filename = "gtk/gtk.h")] - public const int PARAM_WRITABLE; - [CCode (cheader_filename = "gtk/gtk.h")] public const int PATH_PRIO_MASK; [CCode (cheader_filename = "gtk/gtk.h")] public const string PRINT_SETTINGS_COLLATE; @@ -6841,8 +6844,6 @@ namespace Gtk { public const string PRINT_SETTINGS_WIN32_DRIVER_VERSION; [CCode (cheader_filename = "gtk/gtk.h")] public const int PRIORITY_RESIZE; - [CCode (cheader_filename = "gtk/gtk.h")] - public const int SIZE_REQUEST_CACHED_SIZES; [Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")] [CCode (cheader_filename = "gtk/gtk.h")] public const string STOCK_ABOUT; @@ -7165,7 +7166,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static unowned GLib.SList accel_groups_from_object (GLib.Object object); [CCode (cheader_filename = "gtk/gtk.h")] - public static uint accelerator_get_default_mod_mask (); + public static Gdk.ModifierType accelerator_get_default_mod_mask (); [CCode (cheader_filename = "gtk/gtk.h")] public static unowned string accelerator_get_label (uint accelerator_key, Gdk.ModifierType accelerator_mods); [CCode (cheader_filename = "gtk/gtk.h")] diff --git a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala index 9e36598dc..695fa56b0 100644 --- a/vapi/packages/gdk-3.0/gdk-3.0-custom.vala +++ b/vapi/packages/gdk-3.0/gdk-3.0-custom.vala @@ -29,37 +29,6 @@ namespace Gdk { public class Bitmap { } - public class Drawable { - [CCode (cname = "gdk_draw_arc")] - public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2); - [CCode (cname = "gdk_draw_drawable")] - public virtual void draw_drawable (Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cname = "gdk_draw_glyphs")] - public virtual void draw_glyphs (Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cname = "gdk_draw_glyphs_transformed")] - public virtual void draw_glyphs_transformed (Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs); - [CCode (cname = "gdk_draw_image")] - public virtual void draw_image (Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height); - [CCode (cname = "gdk_draw_lines")] - public virtual void draw_lines (Gdk.GC gc, Gdk.Point[] points); - [CCode (cname = "gdk_draw_pixbuf")] - public virtual void draw_pixbuf (Gdk.GC? gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither); - [CCode (cname = "gdk_draw_points")] - public virtual void draw_points (Gdk.GC gc, Gdk.Point[] points); - [CCode (cname = "gdk_draw_polygon")] - public virtual void draw_polygon (Gdk.GC gc, bool filled, Gdk.Point[] points); - [CCode (cname = "gdk_draw_rectangle")] - public virtual void draw_rectangle (Gdk.GC gc, bool filled, int x, int y, int width, int height); - [CCode (cname = "gdk_draw_segments")] - public virtual void draw_segments (Gdk.GC gc, Gdk.Segment[] segs); - [CCode (cname = "gdk_draw_text")] - public virtual void draw_text (Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length); - [CCode (cname = "gdk_draw_text_wc")] - public virtual void draw_text_wc (Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length); - [CCode (cname = "gdk_draw_trapezoids")] - public virtual void draw_trapezoids (Gdk.GC gc, Gdk.Trapezoid[] trapezoids); - } - [Deprecated (since = "vala-0.12", replacement = "Selection.convert")] public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_); [Deprecated (since = "vala-0.12", replacement = "Selection.owner_get")] diff --git a/vapi/packages/gdk-3.0/gdk-3.0.excludes b/vapi/packages/gdk-3.0/gdk-3.0.excludes index 9ca941ac4..735456ca2 100644 --- a/vapi/packages/gdk-3.0/gdk-3.0.excludes +++ b/vapi/packages/gdk-3.0/gdk-3.0.excludes @@ -1,5 +1,6 @@ gdkalias.h gdkkeysyms.h +gdkkeysyms-compat.h gdkx.h gdkdirectfb.h gdkprivate.h diff --git a/vapi/packages/gdk-3.0/gdk-3.0.gi b/vapi/packages/gdk-3.0/gdk-3.0.gi index b7d372236..1c45ecd2b 100644 --- a/vapi/packages/gdk-3.0/gdk-3.0.gi +++ b/vapi/packages/gdk-3.0/gdk-3.0.gi @@ -24,6 +24,13 @@ + + + + + + + @@ -35,7 +42,13 @@ - + + + + + + + @@ -61,13 +74,20 @@ - + - - - + + + + + + + + + + @@ -162,323 +182,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -501,6 +204,9 @@ + + + @@ -535,13 +241,6 @@ - - - - - - - @@ -564,7 +263,7 @@ - + @@ -665,8 +364,8 @@ - - + + @@ -688,7 +387,7 @@ - + @@ -698,7 +397,7 @@ - + @@ -714,65 +413,24 @@ - + - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - @@ -846,46 +504,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -975,7 +593,7 @@ - + @@ -1243,19 +861,11 @@ - - - - - - - - - - + + - - + + @@ -1279,18 +889,6 @@ - - - - - - - - - - - - @@ -1375,7 +973,7 @@ - + @@ -1492,26 +1090,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1546,44 +1124,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1600,194 +1140,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -1797,7 +1173,6 @@ - @@ -1809,21 +1184,20 @@ + + + + + + + + + + + + - - - - - - - - - - - - - @@ -1872,6 +1246,12 @@ + + + + + + @@ -1913,17 +1293,6 @@ - - - - - - - - - - - @@ -2090,71 +1459,51 @@ - - - + + + - - + - - + + - - + + - - + + - + - - + + - - + - - + + - + + - - + + - + - - - + + + + - - - - - - - - - - - - - - - - - - - - @@ -2170,12 +1519,6 @@ - - - - - - @@ -2326,43 +1669,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2387,11 +1698,6 @@ - - - - - @@ -2404,16 +1710,6 @@ - - - - - - - - - - @@ -2422,11 +1718,6 @@ - - - - - @@ -2441,11 +1732,6 @@ - - - - - @@ -2464,10 +1750,6 @@ - - - - @@ -2499,10 +1781,9 @@ - - - - + + + @@ -2552,31 +1833,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2619,11 +1875,10 @@ - - - - - + + + + @@ -2692,66 +1947,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2817,7 +2012,7 @@ - + @@ -2938,6 +2133,12 @@ + + + + + + @@ -2973,6 +2174,12 @@ + + + + + + @@ -3114,6 +2321,12 @@ + + + + + + @@ -3388,683 +2601,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - - + - - + + - + + + - - - + + + - + - - - + + + - - - - + - - - + + + - - - - + - - + + - - + + - + @@ -4114,6 +2695,12 @@ + + + + + + @@ -4166,148 +2753,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4325,12 +2770,6 @@ - - - - - - @@ -4423,24 +2862,6 @@ - - - - - - - - - - - - - - - - - - @@ -4461,12 +2882,6 @@ - - - - - - @@ -4521,13 +2936,6 @@ - - - - - - - @@ -4708,7 +3116,7 @@ - + @@ -4722,32 +3130,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4785,6 +3167,15 @@ + + + + + + + + + @@ -4871,19 +3262,10 @@ - - - - - - - - - - + + - @@ -4911,14 +3293,6 @@ - - - - - - - - @@ -4943,6 +3317,12 @@ + + + + + + @@ -4991,13 +3371,10 @@ - - + + - - - @@ -5055,6 +3432,12 @@ + + + + + + @@ -5080,7 +3463,7 @@ - + @@ -5092,38 +3475,47 @@ + + + + + + + + + + + + - - + + - + - + - - - - + @@ -5132,8 +3524,8 @@ - - + + @@ -5149,7 +3541,7 @@ - + @@ -5232,7 +3624,7 @@ - + @@ -5291,12 +3683,6 @@ - - - - - - @@ -5337,19 +3723,25 @@ - + + + + + + + + - - + - + - + @@ -5443,15 +3835,6 @@ - - - - - - - - - @@ -5578,20 +3961,11 @@ - - - - - - - - - - + @@ -5651,6 +4025,14 @@ + + + + + + + + diff --git a/vapi/packages/gdk-3.0/gdk-3.0.metadata b/vapi/packages/gdk-3.0/gdk-3.0.metadata index 591f6558f..f062e6992 100644 --- a/vapi/packages/gdk-3.0/gdk-3.0.metadata +++ b/vapi/packages/gdk-3.0/gdk-3.0.metadata @@ -95,6 +95,7 @@ gdk_region_rectangle transfer_ownership="1" gdk_region_polygon transfer_ownership="1" gdk_rgb_find_color.color is_ref="1" GdkRgbCmap is_value_type="1" +GdkRGBA is_value_type="1" gdk_screen_get_monitor_geometry.dest is_out="1" gdk_screen_get_toplevel_windows type_arguments="unowned Window" transfer_ownership="1" gdk_screen_get_window_stack type_arguments="Window" transfer_ownership="1" nullable="1" @@ -135,6 +136,7 @@ gdk_window_get_origin.x is_out="1" gdk_window_get_origin.y is_out="1" gdk_window_set_cursor.cursor nullable="1" gdk_window_input_shape_combine_mask.mask nullable="1" +GdkWindow::create_surface namespace_name="Cairo" type_name="Surface" transfer_ownership="1" GdkWindowAttr is_value_type="1" GdkWindowClass common_prefix="GDK_" GdkWindowObject hidden="1" diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi index 0dec2ec81..b196f1767 100644 --- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi +++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi @@ -26,42 +26,41 @@ - - + + - - + - - + + - + - - + + - + + - - + + - + - - + + - + - + - @@ -96,6 +95,13 @@ + + + + + + + @@ -114,18 +120,6 @@ - - - - - - - - - - - - @@ -170,30 +164,12 @@ - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi index e564c9de9..fabb93b2e 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi @@ -16,7 +16,7 @@ - + @@ -2116,11 +2116,6 @@ - - - - - @@ -2163,19 +2158,6 @@ - - - - - - - - - - - - - @@ -2260,10 +2242,10 @@ - - - - + + + + @@ -2630,6 +2612,14 @@ + + + + + + + + @@ -2677,6 +2667,12 @@ + + + + + + @@ -2945,6 +2941,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4450,17 +4471,6 @@ - - - - - - - - - - - @@ -4574,10 +4584,6 @@ - - - - @@ -5819,86 +5825,35 @@ - + - + - - - - - - - - - - - - - + - + - - - + + - - - - - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6936,6 +6891,7 @@ + @@ -7157,6 +7113,7 @@ + @@ -7168,6 +7125,7 @@ + @@ -7327,6 +7285,13 @@ + + + + + + + @@ -7343,6 +7308,7 @@ + @@ -7692,6 +7658,13 @@ + + + + + + + @@ -7713,6 +7686,12 @@ + + + + + + @@ -7727,6 +7706,13 @@ + + + + + + + @@ -7743,6 +7729,7 @@ + @@ -7771,6 +7758,13 @@ + + + + + + + @@ -7796,6 +7790,13 @@ + + + + + + + @@ -7840,6 +7841,13 @@ + + + + + + + @@ -7868,8 +7876,16 @@ + + + + + + + + @@ -7908,13 +7924,6 @@ - - - - - - - @@ -7928,12 +7937,6 @@ - - - - - - @@ -7952,12 +7955,24 @@ + + + + + + + + + + + + @@ -7970,6 +7985,12 @@ + + + + + + @@ -7994,18 +8015,10 @@ - - - - - - - - - + @@ -8033,20 +8046,6 @@ - - - - - - - - - - - - - - @@ -8082,6 +8081,13 @@ + + + + + + + @@ -8096,6 +8102,13 @@ + + + + + + + @@ -8130,9 +8143,12 @@ + + + @@ -8162,47 +8178,61 @@ - - - - - - - + - - + + + + + + + + + + + + + + + - + + + - + - + - - + + - - + + - - + + - - + + + + + + + + - @@ -8712,6 +8742,14 @@ + + + + + + + + @@ -8776,13 +8814,6 @@ - - - - - - - @@ -8839,14 +8870,15 @@ - - + + + - - + + @@ -10245,42 +10277,130 @@ - + - - + + - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10908,6 +11028,7 @@ + @@ -11391,14 +11512,6 @@ - - - - - - - - @@ -12161,6 +12274,7 @@ + @@ -12168,12 +12282,6 @@ - - - - - - @@ -12182,12 +12290,6 @@ - - - - - - @@ -12213,13 +12315,6 @@ - - - - - - - @@ -12228,25 +12323,8 @@ - - - - - - - - - - - - - - - - - @@ -12295,6 +12373,12 @@ + + + + + + @@ -13602,25 +13686,25 @@ - - - + + + - - - + + + - - - + + + @@ -16154,6 +16238,18 @@ + + + + + + + + + + + + @@ -16200,6 +16296,20 @@ + + + + + + + + + + + + + + @@ -16237,6 +16347,8 @@ + + @@ -16368,6 +16480,9 @@ + + + @@ -16383,6 +16498,8 @@ + + @@ -16391,15 +16508,23 @@ + + + + + + + + @@ -17059,12 +17184,6 @@ - - - - - - @@ -17104,14 +17223,6 @@ - - - - - - - - @@ -18654,6 +18765,7 @@ + @@ -18749,12 +18861,6 @@ - - - - - - @@ -18854,12 +18960,6 @@ - - - - - - @@ -19190,14 +19290,6 @@ - - - - - - - - @@ -19210,13 +19302,6 @@ - - - - - - - @@ -19824,6 +19909,7 @@ + @@ -19856,12 +19942,6 @@ - - - - - - @@ -19874,12 +19954,6 @@ - - - - - - @@ -19919,14 +19993,6 @@ - - - - - - - - @@ -20664,6 +20730,7 @@ + @@ -20891,12 +20958,6 @@ - - - - - - @@ -21023,12 +21084,6 @@ - - - - - - @@ -21225,13 +21280,6 @@ - - - - - - - @@ -21368,13 +21416,6 @@ - - - - - - - @@ -21392,7 +21433,6 @@ - @@ -21405,7 +21445,6 @@ - @@ -21478,14 +21517,6 @@ - - - - - - - - @@ -22164,6 +22195,7 @@ + @@ -22171,24 +22203,12 @@ - - - - - - - - - - - - @@ -22202,13 +22222,6 @@ - - - - - - - @@ -22216,24 +22229,7 @@ - - - - - - - - - - - - - - - - - @@ -22349,6 +22345,13 @@ + + + + + + + @@ -22544,6 +22547,18 @@ + + + + + + + + + + + + @@ -22765,6 +22780,18 @@ + + + + + + + + + + + + @@ -22831,12 +22858,6 @@ - - - - - - @@ -23017,6 +23038,12 @@ + + + + + + @@ -23033,6 +23060,13 @@ + + + + + + + @@ -23229,6 +23263,20 @@ + + + + + + + + + + + + + + @@ -23313,14 +23361,6 @@ - - - - - - - - @@ -23385,6 +23425,20 @@ + + + + + + + + + + + + + + @@ -23514,12 +23568,15 @@ + + + @@ -23535,6 +23592,8 @@ + + @@ -23595,8 +23654,8 @@ - - + + @@ -23804,8 +23863,8 @@ - - + + @@ -23845,8 +23904,8 @@ - - + + @@ -24036,7 +24095,10 @@ - + + + + @@ -24044,11 +24106,18 @@ - + + + + + + + + @@ -24103,12 +24172,6 @@ - - - - - - @@ -24201,6 +24264,12 @@ + + + + + + @@ -24279,6 +24348,12 @@ + + + + + + @@ -24335,6 +24410,13 @@ + + + + + + + @@ -24515,6 +24597,20 @@ + + + + + + + + + + + + + + @@ -24522,6 +24618,13 @@ + + + + + + + @@ -24542,6 +24645,14 @@ + + + + + + + + @@ -24636,6 +24747,13 @@ + + + + + + + @@ -24817,6 +24935,7 @@ + @@ -24824,6 +24943,7 @@ + @@ -24832,6 +24952,7 @@ + @@ -24875,13 +24996,6 @@ - - - - - - - @@ -24921,138 +25035,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -26471,6 +26453,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27100,12 +27115,12 @@ - + - + @@ -27114,9 +27129,6 @@ - - - @@ -27149,7 +27161,6 @@ - diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index 0652cb0b0..f9ade2a96 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -48,9 +48,7 @@ gtk_alignment_get_padding.padding_bottom is_out="1" gtk_alignment_get_padding.padding_left is_out="1" gtk_alignment_get_padding.padding_right is_out="1" GtkAllocation is_value_type="1" -gtk_application_new.argc hidden="1" -gtk_application_new.argv is_array="1" is_ref="1" array_length_pos="1.9" nullable="1" default_value="null" -GtkApplication::quit has_emitter="1" +gtk_application_get_windows type_arguments="unowned Window" GtkArg.d hidden="1" GtkAssistant.apply hidden="1" GtkAssistant.cancel hidden="1"