From: Rico Tzschichholz Date: Thu, 21 Aug 2014 21:12:18 +0000 (+0200) Subject: gtk+-2.0, gtk+-3.0: Radio/ActionCallback are only vala-helper types X-Git-Tag: 0.25.2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ae4010985e9eb4ab88c652608da87c90919c7b;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: Radio/ActionCallback are only vala-helper types --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index e989a3895..3184d7fc7 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -7520,7 +7520,7 @@ namespace Gtk { public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed); - [CCode (cheader_filename = "gtk/gtk.h")] + [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")] public delegate void ActionCallback (Gtk.Action action); [CCode (cheader_filename = "gtk/gtk.h")] public delegate int AssistantPageFunc (int current_page); @@ -7580,7 +7580,7 @@ namespace Gtk { public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void PrintSettingsFunc (string key, string value); - [CCode (cheader_filename = "gtk/gtk.h")] + [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")] public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 69b952dcb..b32bffc3b 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -8522,7 +8522,7 @@ namespace Gtk { public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed); - [CCode (cheader_filename = "gtk/gtk.h")] + [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")] public delegate void ActionCallback (Gtk.Action action); [CCode (cheader_filename = "gtk/gtk.h")] public delegate int AssistantPageFunc (int current_page); @@ -8594,7 +8594,7 @@ namespace Gtk { public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup); [CCode (cheader_filename = "gtk/gtk.h")] public delegate void PrintSettingsFunc (string key, string value); - [CCode (cheader_filename = "gtk/gtk.h")] + [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")] public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current); [CCode (cheader_filename = "gtk/gtk.h", has_target = false)] public delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value); 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 8a7f0b72e..a54913f8d 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala +++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala @@ -282,8 +282,10 @@ namespace Gtk { [CCode (has_target = false)] public delegate void CallbackMarshal (Object object, void* data, Arg[] args); + [CCode (type_cname = "GCallback")] public delegate void ActionCallback (Action action); + [CCode (type_cname = "GCallback")] public delegate void RadioActionCallback (Action action, Action current); [CCode (cheader_filename = "gtk/gtk.h")] 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 4ee9b2d6d..8f2b60f2c 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala +++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala @@ -153,8 +153,10 @@ namespace Gtk { public void render_slider (Cairo.Context cr, double x, double y, double width, double height, Gtk.Orientation orientation); } + [CCode (type_cname = "GCallback")] public delegate void ActionCallback (Action action); + [CCode (type_cname = "GCallback")] public delegate void RadioActionCallback (Action action, Action current); [Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")]