gtk+-3.0, gtk+-2.0: work around gtk_style_copy signature mismatch

Fixes bug 662077.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index b287b21b2ed20fdd196551bd21ca31f2bdceff17..4c9c92fa7d9ebc88c86818bd9d7592a2370d6cca 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -4121,7 +4121,10 @@ namespace Gtk {
                public unowned Gtk.Style attach (Gdk.Window window);
                [NoWrapper]
                public virtual unowned Gtk.Style clone ();
-               public virtual Gtk.Style copy ();
+               public Gtk.Style copy ();
+               [CCode (instance_pos = -1, vfunc_name = "copy")]
+               [NoWrapper]
+               public virtual void copy_to (Gtk.Style dest);
                public void detach ();
                [NoWrapper]
                public virtual void draw_arrow (Gdk.Window window, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gdk.Rectangle area, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 38d7ed9912749c2e63984fc0e21ee88176f02914..fadaaa689e280472d192f397573d155f7edfddd1 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -3979,7 +3979,10 @@ namespace Gtk {
                public unowned Gtk.Style attach (Gdk.Window window);
                [NoWrapper]
                public virtual unowned Gtk.Style clone ();
-               public virtual Gtk.Style copy ();
+               public Gtk.Style copy ();
+               [CCode (instance_pos = -1, vfunc_name = "copy")]
+               [NoWrapper]
+               public virtual void copy_to (Gtk.Style dest);
                public void detach ();
                [NoWrapper]
                public virtual void draw_arrow (Cairo.Context cr, Gtk.StateType state_type, Gtk.ShadowType shadow_type, Gtk.Widget widget, string detail, Gtk.ArrowType arrow_type, bool fill, int x, int y, int width, int height);

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index e9ae8c14bdb3a77ab744ce5423de0f06ce23f667..4339d178baf1a5a23aea554cc71de0bf62ee683e 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -111,6 +111,13 @@ namespace Gtk {
                UNSORTED
        }
 
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class Style {
+               [NoWrapper]
+               [CCode (instance_pos = -1, vfunc_name = "copy")]
+               public virtual void copy_to (Gtk.Style dest);
+       }
+
        [CCode (has_target = false)]
        public delegate void CallbackMarshal (Object object, void* data, Arg[] args);
 

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index d1e75b2e41691453b1b84649349013574ff1fce1..cc06e08aac110ac7bccebae95f6d01d37ed0393f 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -563,7 +563,7 @@ GtkStyle.text_gc weak="0"
 GtkStyle.base_gc weak="0"
 GtkStyle.text_aa_gc weak="0"
 GtkStyle.bg_pixmap weak="0"
-gtk_style_copy type_name="Style" transfer_ownership="1"
+gtk_style_copy virtual="0" type_name="Style" transfer_ownership="1"
 gtk_style_lookup_color.color is_out="1"
 gtk_style_get_style_property.value is_out="1"
 GtkTable.children type_arguments="TableChild"

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 9bd6a8b1f50d9833fcf84f6fb7bf374c08999448..7d03752611ac14a33ab5637e85f2452391cdb559 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -76,6 +76,13 @@ namespace Gtk {
                UNSORTED
        }
 
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       public class Style {
+               [NoWrapper]
+               [CCode (instance_pos = -1, vfunc_name = "copy")]
+               public virtual void copy_to (Gtk.Style dest);
+       }
+
        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 24b09ff5697e624ba48b532920aee2a256a21be0..968d7ddea28c5dbfe02235425a1a360f7f8ca863 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -613,7 +613,7 @@ GtkStyle.text_gc weak="0"
 GtkStyle.base_gc weak="0"
 GtkStyle.text_aa_gc weak="0"
 GtkStyle.bg_pixmap weak="0"
-gtk_style_copy type_name="Style" transfer_ownership="1"
+gtk_style_copy virtual="0" type_name="Style" transfer_ownership="1"
 gtk_style_context_get ellipsis="1"
 gtk_style_context_get_background_color type_name="Gdk.RGBA"
 gtk_style_context_get_background_color.color hidden="1"