diff --git a/ChangeLog b/ChangeLog index 186f5bf60..3e28d9640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-07 Mike Kestner + + * atk/Object.custom, atk/glue/object.c: Remove unneeded + return types (I don't know why gcc ever let this compile...). + 2008-05-06 Mike Kestner * glib/Object.cs: revert the connection optimization from r102349. diff --git a/atk/Object.custom b/atk/Object.custom index 93d2decc3..10e4a17a3 100644 --- a/atk/Object.custom +++ b/atk/Object.custom @@ -22,7 +22,7 @@ // Boston, MA 02111-1307, USA. [DllImport("atksharpglue-2")] - static extern int atksharp_object_override_get_n_children (IntPtr type, NChildrenDelegate cb); + static extern void atksharp_object_override_get_n_children (IntPtr type, NChildrenDelegate cb); [GLib.CDeclCallback] delegate int NChildrenDelegate (IntPtr raw); @@ -54,7 +54,7 @@ } [DllImport("atksharpglue-2")] - static extern IntPtr atksharp_object_override_ref_child (IntPtr type, RefChildDelegate cb); + static extern void atksharp_object_override_ref_child (IntPtr type, RefChildDelegate cb); [GLib.CDeclCallback] delegate IntPtr RefChildDelegate (IntPtr raw, int i); diff --git a/atk/glue/object.c b/atk/glue/object.c index ace78703e..59b7039d4 100644 --- a/atk/glue/object.c +++ b/atk/glue/object.c @@ -22,9 +22,11 @@ #include -gint atksharp_object_override_get_n_children (GType gtype, gpointer cb); +void atksharp_object_override_get_n_children (GType gtype, gpointer cb); -gint +void atksharp_object_override_ref_child (GType gtype, gpointer cb); + +void atksharp_object_override_get_n_children (GType gtype, gpointer cb) { AtkObjectClass *klass = g_type_class_peek (gtype); @@ -33,9 +35,7 @@ atksharp_object_override_get_n_children (GType gtype, gpointer cb) ((AtkObjectClass *) klass)->get_n_children = cb; } -AtkObject* atksharp_object_override_ref_child (GType gtype, gpointer cb); - -AtkObject* +void atksharp_object_override_ref_child (GType gtype, gpointer cb) { AtkObjectClass *klass = g_type_class_peek (gtype);