diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-12-17 19:16:39 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-12-17 19:16:39 +0100 |
commit | 45a81992da876d74d8446318734b1023766e8ed9 (patch) | |
tree | 5cdb9e58ca8637e14b6ab9489e2f3f9f6b937735 | |
parent | 2cf2c4f6e3902bb869fefcc9cd2ac0d361cc76fd (diff) | |
download | vala-45a81992da876d74d8446318734b1023766e8ed9.tar.gz |
gdk-3.0, gtk+-3.0: Update to 3.11.3
-rw-r--r-- | vapi/gdk-3.0.vapi | 7 | ||||
-rw-r--r-- | vapi/gtk+-3.0.vapi | 19 | ||||
-rw-r--r-- | vapi/packages/gtk+-3.0/gtk+-3.0.gi | 36 |
3 files changed, 43 insertions, 19 deletions
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index cde943ea8..374c31b24 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -4935,7 +4935,7 @@ namespace Gdk { public void begin_resize_drag_for_device (Gdk.WindowEdge edge, Gdk.Device device, int button, int root_x, int root_y, uint32 timestamp); [Deprecated (since = "3.8")] 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 static void constrain_size (Gdk.Geometry geometry, Gdk.WindowHints flags, int width, int height, out int new_width, out int new_height); public void coords_from_parent (double parent_x, double parent_y, out double x, out double y); public void coords_to_parent (double x, double y, out double parent_x, out double parent_y); public Cairo.Surface create_similar_image_surface (int format, int width, int height, int scale); @@ -5057,6 +5057,7 @@ namespace Gdk { public void set_opaque_region (Cairo.Region region); public void set_override_redirect (bool override_redirect); public void set_role (string role); + public void set_shadow_width (int left, int right, int top, int bottom); public void set_skip_pager_hint (bool skips_pager); public void set_skip_taskbar_hint (bool skips_taskbar); public void set_source_events (Gdk.InputSource source, Gdk.EventMask event_mask); @@ -5874,6 +5875,10 @@ namespace Gdk { public const int BUTTON_SECONDARY; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_CURRENT_TIME")] public const int CURRENT_TIME; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_EVENT_PROPAGATE")] + public const bool EVENT_PROPAGATE; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_EVENT_STOP")] + public const bool EVENT_STOP; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_MAX_TIMECOORD_AXES")] public const int MAX_TIMECOORD_AXES; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_PARENT_RELATIVE")] diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 317d94fd3..475ae3150 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -2360,20 +2360,20 @@ namespace Gtk { [CCode (has_construct_function = false, type = "GtkWidget*")] public HeaderBar (); public unowned Gtk.Widget get_custom_title (); + public bool get_has_subtitle (); public bool get_show_close_button (); - public bool get_show_fallback_app_menu (); public unowned string get_subtitle (); public unowned string get_title (); public void pack_end (Gtk.Widget child); public void pack_start (Gtk.Widget child); public void set_custom_title (Gtk.Widget title_widget); + public void set_has_subtitle (bool setting); public void set_show_close_button (bool setting); - public void set_show_fallback_app_menu (bool setting); public void set_subtitle (string? subtitle); public void set_title (string title); public Gtk.Widget custom_title { get; set construct; } + public bool has_subtitle { get; set; } public bool show_close_button { get; set; } - public bool show_fallback_app_menu { get; set; } [NoAccessorMethod] public int spacing { get; set; } public string subtitle { get; set; } @@ -3815,7 +3815,6 @@ namespace Gtk { [CCode (has_construct_function = false)] protected Range (); public unowned Gtk.Adjustment get_adjustment (); - public unowned Gdk.Window get_event_window (); public double get_fill_level (); public bool get_flippable (); public bool get_inverted (); @@ -7718,7 +7717,11 @@ namespace Gtk { LGPL_3_0, BSD, MIT_X11, - ARTISTIC + ARTISTIC, + GPL_2_0_ONLY, + GPL_3_0_ONLY, + LGPL_2_1_ONLY, + LGPL_3_0_ONLY } [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MENU_DIR_")] public enum MenuDirectionType { @@ -9128,6 +9131,8 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static bool events_pending (); [CCode (cheader_filename = "gtk/gtk.h")] + public static void exit (int error_code); + [CCode (cheader_filename = "gtk/gtk.h")] public static uint get_binary_age (); [CCode (cheader_filename = "gtk/gtk.h")] public static Gdk.Event get_current_event (); @@ -9146,6 +9151,8 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static uint get_interface_age (); [CCode (cheader_filename = "gtk/gtk.h")] + public static Gtk.TextDirection get_locale_direction (); + [CCode (cheader_filename = "gtk/gtk.h")] public static uint get_major_version (); [CCode (cheader_filename = "gtk/gtk.h")] public static uint get_micro_version (); @@ -9378,6 +9385,8 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static void set_debug_flags (uint flags); [CCode (cheader_filename = "gtk/gtk.h")] + public static unowned string set_locale (); + [CCode (cheader_filename = "gtk/gtk.h")] public static void show_about_dialog (Gtk.Window? parent, ...); [CCode (cheader_filename = "gtk/gtk.h")] public static bool show_uri (Gdk.Screen? screen, string uri, uint32 timestamp) throws GLib.Error; diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.gi b/vapi/packages/gtk+-3.0/gtk+-3.0.gi index 6d110e0db..97c0e46a2 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.gi +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.gi @@ -442,6 +442,12 @@ <function name="events_pending" symbol="gtk_events_pending"> <return-type type="gboolean"/> </function> + <function name="exit" symbol="gtk_exit"> + <return-type type="void"/> + <parameters> + <parameter name="error_code" type="gint"/> + </parameters> + </function> <function name="false" symbol="gtk_false"> <return-type type="gboolean"/> </function> @@ -478,6 +484,9 @@ <function name="get_interface_age" symbol="gtk_get_interface_age"> <return-type type="guint"/> </function> + <function name="get_locale_direction" symbol="gtk_get_locale_direction"> + <return-type type="GtkTextDirection"/> + </function> <function name="get_major_version" symbol="gtk_get_major_version"> <return-type type="guint"/> </function> @@ -1340,6 +1349,9 @@ <parameter name="flags" type="guint"/> </parameters> </function> + <function name="set_locale" symbol="gtk_set_locale"> + <return-type type="gchar*"/> + </function> <function name="show_about_dialog" symbol="gtk_show_about_dialog"> <return-type type="void"/> <parameters> @@ -4749,6 +4761,10 @@ <member name="GTK_LICENSE_BSD" value="6"/> <member name="GTK_LICENSE_MIT_X11" value="7"/> <member name="GTK_LICENSE_ARTISTIC" value="8"/> + <member name="GTK_LICENSE_GPL_2_0_ONLY" value="9"/> + <member name="GTK_LICENSE_GPL_3_0_ONLY" value="10"/> + <member name="GTK_LICENSE_LGPL_2_1_ONLY" value="11"/> + <member name="GTK_LICENSE_LGPL_3_0_ONLY" value="12"/> </enum> <enum name="GtkMenuDirectionType" type-name="GtkMenuDirectionType" get-type="gtk_menu_direction_type_get_type"> <member name="GTK_MENU_DIR_PARENT" value="0"/> @@ -13627,13 +13643,13 @@ <parameter name="bar" type="GtkHeaderBar*"/> </parameters> </method> - <method name="get_show_close_button" symbol="gtk_header_bar_get_show_close_button"> + <method name="get_has_subtitle" symbol="gtk_header_bar_get_has_subtitle"> <return-type type="gboolean"/> <parameters> <parameter name="bar" type="GtkHeaderBar*"/> </parameters> </method> - <method name="get_show_fallback_app_menu" symbol="gtk_header_bar_get_show_fallback_app_menu"> + <method name="get_show_close_button" symbol="gtk_header_bar_get_show_close_button"> <return-type type="gboolean"/> <parameters> <parameter name="bar" type="GtkHeaderBar*"/> @@ -13675,14 +13691,14 @@ <parameter name="title_widget" type="GtkWidget*"/> </parameters> </method> - <method name="set_show_close_button" symbol="gtk_header_bar_set_show_close_button"> + <method name="set_has_subtitle" symbol="gtk_header_bar_set_has_subtitle"> <return-type type="void"/> <parameters> <parameter name="bar" type="GtkHeaderBar*"/> <parameter name="setting" type="gboolean"/> </parameters> </method> - <method name="set_show_fallback_app_menu" symbol="gtk_header_bar_set_show_fallback_app_menu"> + <method name="set_show_close_button" symbol="gtk_header_bar_set_show_close_button"> <return-type type="void"/> <parameters> <parameter name="bar" type="GtkHeaderBar*"/> @@ -13704,8 +13720,8 @@ </parameters> </method> <property name="custom-title" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/> + <property name="has-subtitle" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/> <property name="show-close-button" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/> - <property name="show-fallback-app-menu" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/> <property name="spacing" type="gint" readable="1" writable="1" construct="0" construct-only="0"/> <property name="subtitle" type="char*" readable="1" writable="1" construct="0" construct-only="0"/> <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/> @@ -19748,12 +19764,6 @@ <parameter name="range" type="GtkRange*"/> </parameters> </method> - <method name="get_event_window" symbol="gtk_range_get_event_window"> - <return-type type="GdkWindow*"/> - <parameters> - <parameter name="range" type="GtkRange*"/> - </parameters> - </method> <method name="get_fill_level" symbol="gtk_range_get_fill_level"> <return-type type="gdouble"/> <parameters> @@ -33908,14 +33918,14 @@ </parameters> </vfunc> </interface> - <constant name="GTK_BINARY_AGE" type="int" value="1101"/> + <constant name="GTK_BINARY_AGE" type="int" value="1103"/> <constant name="GTK_INPUT_ERROR" type="int" value="-1"/> <constant name="GTK_INTERFACE_AGE" type="int" value="0"/> <constant name="GTK_LEVEL_BAR_OFFSET_HIGH" type="char*" value="high"/> <constant name="GTK_LEVEL_BAR_OFFSET_LOW" type="char*" value="low"/> <constant name="GTK_MAJOR_VERSION" type="int" value="3"/> <constant name="GTK_MAX_COMPOSE_LEN" type="int" value="7"/> - <constant name="GTK_MICRO_VERSION" type="int" value="2"/> + <constant name="GTK_MICRO_VERSION" type="int" value="3"/> <constant name="GTK_MINOR_VERSION" type="int" value="11"/> <constant name="GTK_PAPER_NAME_A3" type="char*" value="iso_a3"/> <constant name="GTK_PAPER_NAME_A4" type="char*" value="iso_a4"/> |