diff options
Diffstat (limited to 'gir/gobject-2.0.c')
| -rw-r--r-- | gir/gobject-2.0.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index e7831801..bbe32598 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -582,8 +582,8 @@ * For a tutorial on implementing a new GObject class, see [How to define and * implement a new GObject][howto-gobject]. For a list of naming conventions for * GObjects and their methods, see the [GType conventions][gtype-conventions]. - * For the high-level concepts behind GObject, read [Instantiable classed types: - * Objects][gtype-instantiable-classed]. + * For the high-level concepts behind GObject, read [Instantiatable classed types: + * Objects][gtype-instantiatable-classed]. * * ## Floating references # {#floating-ref} * @@ -5194,11 +5194,11 @@ /** * g_type_add_interface_dynamic: - * @instance_type: #GType value of an instantiable type + * @instance_type: #GType value of an instantiatable type * @interface_type: #GType value of an interface type * @plugin: #GTypePlugin structure to retrieve the #GInterfaceInfo from * - * Adds @interface_type to the dynamic @instantiable_type. The information + * Adds @interface_type to the dynamic @instance_type. The information * contained in the #GTypePlugin structure pointed to by @plugin * is used to manage the relationship. */ @@ -5206,12 +5206,12 @@ /** * g_type_add_interface_static: - * @instance_type: #GType value of an instantiable type + * @instance_type: #GType value of an instantiatable type * @interface_type: #GType value of an interface type * @info: #GInterfaceInfo structure for this * (@instance_type, @interface_type) combination * - * Adds @interface_type to the static @instantiable_type. + * Adds @interface_type to the static @instance_type. * The information contained in the #GInterfaceInfo structure * pointed to by @info is used to manage the relationship. */ @@ -5689,6 +5689,22 @@ /** + * g_type_interface_instantiatable_prerequisite: + * @interface_type: an interface type + * + * Returns the most specific instantiatable prerequisite of an + * interface type. If the interface type has no instantiatable + * prerequisite, %G_TYPE_INVALID is returned. + * + * See g_type_interface_add_prerequisite() for more information + * about prerequisites. + * + * Returns: the instantiatable prerequisite type or %G_TYPE_INVALID if none + * Since: 2.68 + */ + + +/** * g_type_interface_peek: * @instance_class: (type GObject.TypeClass): a #GTypeClass structure * @iface_type: an interface ID which this class conforms to @@ -5912,7 +5928,7 @@ * @root_type: immediate parent of the returned type * * Given a @leaf_type and a @root_type which is contained in its - * anchestry, return the type that @root_type is the immediate parent + * ancestry, return the type that @root_type is the immediate parent * of. In other words, this function determines the type that is * derived directly from @root_type which is also a base class of * @leaf_type. Given a root type and a leaf type, this function can @@ -5937,7 +5953,7 @@ /** * g_type_plugin_complete_interface_info: * @plugin: the #GTypePlugin - * @instance_type: the #GType of an instantiable type to which the interface + * @instance_type: the #GType of an instantiatable type to which the interface * is added * @interface_type: the #GType of the interface whose info is completed * @info: the #GInterfaceInfo to fill in |