[vala] gtk+-3.0, gtk+-2.0: work around gtk_style_copy signature mismatch
- From: Evan Nemerson <evann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gtk+-3.0, gtk+-2.0: work around gtk_style_copy signature mismatch
- Date: Tue, 18 Oct 2011 21:37:23 +0000 (UTC)
commit 5f8a16980b0d7a8885308a7e14d3026f078c59bc
Author: Evan Nemerson <evan coeus-group com>
Date: Tue Oct 18 14:29:25 2011 -0700
gtk+-3.0, gtk+-2.0: work around gtk_style_copy signature mismatch
Fixes bug 662077.
vapi/gtk+-2.0.vapi | 5 ++++-
vapi/gtk+-3.0.vapi | 5 ++++-
vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala | 7 +++++++
vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 2 +-
vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala | 7 +++++++
vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 2 +-
6 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index b287b21..4c9c92f 100644
--- 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 38d7ed9..fadaaa6 100644
--- 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 e9ae8c1..4339d17 100644
--- 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 d1e75b2..cc06e08 100644
--- 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 9bd6a8b..7d03752 100644
--- 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 24b09ff..968d7dd 100644
--- 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]