Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_16' into...

[platform/upstream/atk.git] / atk / atknoopobjectfactory.c

diff --git a/atk/atknoopobjectfactory.c b/atk/atknoopobjectfactory.c
index 0b0547a..2b0a90a 100755 (executable)
--- a/atk/atknoopobjectfactory.c
+++ b/atk/atknoopobjectfactory.c
@@ -21,16 +21,26 @@
 #include "atknoopobject.h"
 #include "atknoopobjectfactory.h"
 
+/**
+ * SECTION:atknoopobjectfactory
+ * @Short_description: The AtkObjectFactory which creates an AtkNoOpObject.
+ * @Title:AtkNoOpObjectFactory
+ *
+ * The AtkObjectFactory which creates an AtkNoOpObject. An instance of
+ * this is created by an AtkRegistry if no factory type has not been
+ * specified to create an accessible object of a particular type.
+ */
 static void atk_no_op_object_factory_class_init (
                               AtkNoOpObjectFactoryClass        *klass);
 
 static AtkObject* atk_no_op_object_factory_create_accessible (
                               GObject                          *obj);
+static GType      atk_no_op_object_factory_get_accessible_type (void);
 
-static AtkNoOpObjectFactoryClass    *parent_class = NULL;
+static gpointer    parent_class = NULL;
 
 GType
-atk_no_op_object_factory_get_type ()
+atk_no_op_object_factory_get_type (void)
 {
   static GType type = 0;
 
@@ -62,13 +72,22 @@ atk_no_op_object_factory_class_init (AtkNoOpObjectFactoryClass *klass)
 {
   AtkObjectFactoryClass *class = ATK_OBJECT_FACTORY_CLASS (klass);
 
-  parent_class = g_type_class_ref (ATK_TYPE_OBJECT_FACTORY);
+  parent_class = g_type_class_peek_parent (klass);
 
   class->create_accessible = atk_no_op_object_factory_create_accessible;
+  class->get_accessible_type = atk_no_op_object_factory_get_accessible_type;
 }
 
+/**
+ * atk_no_op_object_factory_new:
+ *
+ * Creates an instance of an #AtkObjectFactory which generates primitive
+ * (non-functioning) #AtkObjects. 
+ *
+ * Returns: an instance of an #AtkObjectFactory
+ **/
 AtkObjectFactory* 
-atk_no_op_object_factory_new ()
+atk_no_op_object_factory_new (void)
 {
   GObject *factory;
 
@@ -87,3 +106,9 @@ atk_no_op_object_factory_create_accessible (GObject   *obj)
 
   return accessible;
 }
+
+static GType
+atk_no_op_object_factory_get_accessible_type (void)
+{
+  return ATK_TYPE_NO_OP_OBJECT;
+}