From dddf13e2fb789f470be300ba3cebcca58b77a87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Mon, 16 Jun 2008 18:03:28 +0000 Subject: [PATCH] * atk/Object.custom: * atk/glue/object.c: Simplified code for previous issue (recommendation from mkestner). svn path=/trunk/gtk-sharp/; revision=105929 --- ChangeLog | 6 ++++++ atk/Object.custom | 4 ++-- atk/glue/object.c | 7 +++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4706429c6..dc6624731 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-16 Andrés G. Aragoneses + + * atk/Object.custom: + * atk/glue/object.c: + Simplified code for previous issue (recommendation from mkestner). + 2008-06-16 Mike Kestner * glib/glue/object.c: fixes for object, boxed, and gtype diff --git a/atk/Object.custom b/atk/Object.custom index 31af442c0..f56ae6842 100644 --- a/atk/Object.custom +++ b/atk/Object.custom @@ -110,7 +110,7 @@ static extern void atksharp_object_override_ref_state_set (IntPtr type, RefStateSetDelegate cb); [DllImport("atksharpglue-2")] - static extern IntPtr atksharp_object_base_ref_state_set (IntPtr atk_obj, IntPtr gtype); + static extern IntPtr atksharp_object_base_ref_state_set (IntPtr atk_obj); [GLib.CDeclCallback] delegate IntPtr RefStateSetDelegate (IntPtr raw); @@ -142,7 +142,7 @@ [GLib.DefaultSignalHandler (Type=typeof(Atk.Object), ConnectionMethod="OverrideRefStateSet")] protected virtual Atk.StateSet OnRefStateSet () { - IntPtr raw = atksharp_object_base_ref_state_set (Handle, GLib.GType.FromName("AtkObject").Val); + IntPtr raw = atksharp_object_base_ref_state_set (Handle); return GLib.Object.GetObject (raw, true) as StateSet; } diff --git a/atk/glue/object.c b/atk/glue/object.c index c4dee2201..febb37368 100644 --- a/atk/glue/object.c +++ b/atk/glue/object.c @@ -28,7 +28,7 @@ void atksharp_object_override_ref_child (GType gtype, gpointer cb); void atksharp_object_override_ref_state_set (GType gtype, gpointer cb); -AtkStateSet* atksharp_object_base_ref_state_set (AtkObject *base, GType gtype); +AtkStateSet* atksharp_object_base_ref_state_set (AtkObject *base); void @@ -59,10 +59,9 @@ atksharp_object_override_ref_state_set (GType gtype, gpointer cb) } AtkStateSet* -atksharp_object_base_ref_state_set (AtkObject *atk_obj, GType gtype) +atksharp_object_base_ref_state_set (AtkObject *atk_obj) { - //FIXME: find a cleaner way of doing this (it comes from a managed call to GType.FromName() : - AtkObjectClass *parent = g_type_class_peek (gtype); + AtkObjectClass *parent = g_type_class_peek (ATK_TYPE_OBJECT); if (parent->ref_state_set) return (*parent->ref_state_set) (atk_obj);