gtk+-3.0: Move render functions in StyleContext

Fixes bug 664117.

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 1c0113d819ba89b08149ff3ebc725b2a4260a3e7..94cc2636a1b4e7de06ec20c9ebdb4776539939d6 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1508,7 +1508,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void remove (Gtk.Widget widget);
                [HasEmitter]
-               public virtual signal void set_focus_child (Gtk.Widget child);
+               public virtual signal void set_focus_child (Gtk.Widget? child);
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
        public class CssProvider : GLib.Object, Gtk.StyleProvider {
@@ -4076,6 +4076,38 @@ namespace Gtk {
                public void remove_provider (Gtk.StyleProvider provider);
                public static void remove_provider_for_screen (Gdk.Screen screen, Gtk.StyleProvider provider);
                public void remove_region (string region_name);
+               [CCode (cname = "gtk_render_activity")]
+               public void render_activity (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_arrow")]
+               public void render_arrow (Cairo.Context cr, double angle, double x, double y, double size);
+               [CCode (cname = "gtk_render_background")]
+               public void render_background (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_check")]
+               public void render_check (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_expander")]
+               public void render_expander (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_extension")]
+               public void render_extension (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+               [CCode (cname = "gtk_render_focus")]
+               public void render_focus (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_frame")]
+               public void render_frame (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_frame_gap")]
+               public void render_frame_gap (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+               [CCode (cname = "gtk_render_handle")]
+               public void render_handle (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_icon")]
+               public void render_icon (Cairo.Context cr, Gdk.Pixbuf pixbuf, double x, double y);
+               [CCode (cname = "gtk_render_icon_pixbuf")]
+               public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.IconSource source, Gtk.IconSize size);
+               [CCode (cname = "gtk_render_layout")]
+               public void render_layout (Cairo.Context cr, double x, double y, Pango.Layout layout);
+               [CCode (cname = "gtk_render_line")]
+               public void render_line (Cairo.Context cr, double x0, double y0, double x1, double y1);
+               [CCode (cname = "gtk_render_option")]
+               public void render_option (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_slider")]
+               public void render_slider (Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
                public static void reset_widgets (Gdk.Screen screen);
                public void restore ();
                public void save ();
@@ -8174,36 +8206,52 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rc_set_default_files (string filenames);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_activity", since = "vala-0.16")]
        public static void render_activity (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_arrow", since = "vala-0.16")]
        public static void render_arrow (Gtk.StyleContext context, Cairo.Context cr, double angle, double x, double y, double size);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_background", since = "vala-0.16")]
        public static void render_background (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_check", since = "vala-0.16")]
        public static void render_check (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_expander", since = "vala-0.16")]
        public static void render_expander (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_extension", since = "vala-0.16")]
        public static void render_extension (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_focus", since = "vala-0.16")]
        public static void render_focus (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_frame", since = "vala-0.16")]
        public static void render_frame (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_frame_gap", since = "vala-0.16")]
        public static void render_frame_gap (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_handle", since = "vala-0.16")]
        public static void render_handle (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_icon", since = "vala-0.16")]
        public static void render_icon (Gtk.StyleContext context, Cairo.Context cr, Gdk.Pixbuf pixbuf, double x, double y);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_icon_pixbuf", since = "vala-0.16")]
        public static unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSource source, Gtk.IconSize size);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_layout", since = "vala-0.16")]
        public static void render_layout (Gtk.StyleContext context, Cairo.Context cr, double x, double y, Pango.Layout layout);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_line", since = "vala-0.16")]
        public static void render_line (Gtk.StyleContext context, Cairo.Context cr, double x0, double y0, double x1, double y1);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_option", since = "vala-0.16")]
        public static void render_option (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Deprecated (replacement = "StyleContext.render_slider", since = "vala-0.16")]
        public static void render_slider (Gtk.StyleContext context, Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rgb_to_hsv (double r, double g, double b, double h, double s, double v);

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index 950058b7f483cef2f1da8a0339f582eefc9bc273..2aaa6203941b69e6bb5e680931e7e24c128141aa 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -92,6 +92,42 @@ namespace Gtk {
                public virtual void copy_to (Gtk.Style dest);
        }
 
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class StyleContext {
+               [CCode (cname = "gtk_render_activity")]
+               public void render_activity (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_arrow")]
+               public void render_arrow (Cairo.Context cr, double angle, double x, double y, double size);
+               [CCode (cname = "gtk_render_background")]
+               public void render_background (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_check")]
+               public void render_check (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_expander")]
+               public void render_expander (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_extension")]
+               public void render_extension (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side);
+               [CCode (cname = "gtk_render_focus")]
+               public void render_focus (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_frame")]
+               public void render_frame (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_frame_gap")]
+               public void render_frame_gap (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType gap_side, double xy0_gap, double xy1_gap);
+               [CCode (cname = "gtk_render_handle")]
+               public void render_handle (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_icon")]
+               public void render_icon (Cairo.Context cr, Gdk.Pixbuf pixbuf, double x, double y);
+               [CCode (cname = "gtk_render_icon_pixbuf")]
+               public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.IconSource source, Gtk.IconSize size);
+               [CCode (cname = "gtk_render_layout")]
+               public void render_layout (Cairo.Context cr, double x, double y, Pango.Layout layout);
+               [CCode (cname = "gtk_render_line")]
+               public void render_line (Cairo.Context cr, double x0, double y0, double x1, double y1);
+               [CCode (cname = "gtk_render_option")]
+               public void render_option (Cairo.Context cr, double x, double y, double width, double height);
+               [CCode (cname = "gtk_render_slider")]
+               public void render_slider (Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation);
+       }
+
        public delegate void ActionCallback (Action action);
 
        public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in);

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index fbb4281e23945a290803b3d83b9757862691a856..3389b1aa4d5a6aadb5e5ea9ada2eb893a9c87768 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -195,7 +195,7 @@ GtkContainer::add has_emitter="1"
 GtkContainer::check_resize has_emitter="1"
 GtkContainer::remove has_emitter="1"
 GtkContainer::set_focus_child has_emitter="1"
-GtkContainer::set_focus_child.widget nullable="1"
+GtkContainer::set_focus_child.child nullable="1"
 gtk_container_forall.callback_data hidden="1"
 gtk_container_foreach.callback_data hidden="1"
 gtk_container_get_children transfer_ownership="1" type_arguments="unowned Widget"
@@ -1085,5 +1085,21 @@ GtkWidget::selection_request_event.event namespace_name="Gdk" type_name="EventSe
 GtkWidget::unmap_event.event namespace_name="Gdk" type_name="EventAny"
 GtkWidget::visibility_notify_event.event namespace_name="Gdk" type_name="EventVisibility"
 GtkWidget::window_state_event.event namespace_name="Gdk" type_name="EventWindowState"
+gtk_render_activity deprecated_since="vala-0.16" replacement="StyleContext.render_activity"
+gtk_render_arrow deprecated_since="vala-0.16" replacement="StyleContext.render_arrow"
+gtk_render_background deprecated_since="vala-0.16" replacement="StyleContext.render_background"
+gtk_render_check deprecated_since="vala-0.16" replacement="StyleContext.render_check"
+gtk_render_expander deprecated_since="vala-0.16" replacement="StyleContext.render_expander"
+gtk_render_extension deprecated_since="vala-0.16" replacement="StyleContext.render_extension"
+gtk_render_focus deprecated_since="vala-0.16" replacement="StyleContext.render_focus"
+gtk_render_frame deprecated_since="vala-0.16" replacement="StyleContext.render_frame"
+gtk_render_frame_gap deprecated_since="vala-0.16" replacement="StyleContext.render_frame_gap"
+gtk_render_handle deprecated_since="vala-0.16" replacement="StyleContext.render_handle"
+gtk_render_icon deprecated_since="vala-0.16" replacement="StyleContext.render_icon"
+gtk_render_icon_pixbuf deprecated_since="vala-0.16" replacement="StyleContext.render_icon_pixbuf"
+gtk_render_layout deprecated_since="vala-0.16" replacement="StyleContext.render_layout"
+gtk_render_line deprecated_since="vala-0.16" replacement="StyleContext.render_line"
+gtk_render_option deprecated_since="vala-0.16" replacement="StyleContext.render_option"
+gtk_render_slider deprecated_since="vala-0.16" replacement="StyleContext.render_slider"
 
 *._g_sealed__* hidden="1"