Add G_IMPLEMENT_INTERFACE_DYNAMIC

Convenience macro to easy interface addition for dynamic types.

https://bugzilla.gnome.org/show_bug.cgi?id=508157

diff --git a/docs/reference/gobject/gobject-sections.txt b/docs/reference/gobject/gobject-sections.txt
index b970c28727ae8e549265a85abbe378a30d2c0d93..a6efb308aea0f0253f00f500a293661e448cc351 100644 (file)
--- a/docs/reference/gobject/gobject-sections.txt
+++ b/docs/reference/gobject/gobject-sections.txt
@@ -202,6 +202,7 @@ g_type_module_register_flags
 
 G_DEFINE_DYNAMIC_TYPE
 G_DEFINE_DYNAMIC_TYPE_EXTENDED
+G_IMPLEMENT_INTERFACE_DYNAMIC
 
 <SUBSECTION Standard>
 G_TYPE_MODULE

diff --git a/gobject/gtypemodule.h b/gobject/gtypemodule.h
index a7c3cf9b28d2498dbf173c8a1bfd56fb44be3318..a1eec3e121b22f0edc89b0d57312cc367aab8b17 100644 (file)
--- a/gobject/gtypemodule.h
+++ b/gobject/gtypemodule.h
@@ -119,8 +119,8 @@ struct _GTypeModuleClass
  *                                 gtk_gadget,
  *                                 GTK_TYPE_THING,
  *                                 0,
- *                                 G_IMPLEMENT_INTERFACE (TYPE_GIZMO,
- *                                                        gtk_gadget_gizmo_init));
+ *                                 G_IMPLEMENT_INTERFACE_DYNAMIC (TYPE_GIZMO,
+ *                                                                gtk_gadget_gizmo_init));
  * ]|
  * expands to
  * |[
@@ -167,7 +167,7 @@ struct _GTypeModuleClass
  *     const GInterfaceInfo g_implement_interface_info = {
  *       (GInterfaceInitFunc) gtk_gadget_gizmo_init
  *     };
- *     g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
+ *     g_type_module_add_interface (type_module, g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
  *   }
  * }
  * ]|
@@ -215,6 +215,27 @@ type_name##_register_type (GTypeModule *type_module) \
   { CODE ; } \
 }
 
+/**
+ * G_IMPLEMENT_INTERFACE_DYNAMIC:
+ * @TYPE_IFACE: The #GType of the interface to add
+ * @iface_init: The interface init function
+ *
+ * A convenience macro to ease interface addition in the @_C_ section
+ * of G_DEFINE_DYNAMIC_TYPE_EXTENDED(). See G_DEFINE_DYNAMIC_TYPE_EXTENDED()
+ * for an example.
+ *
+ * Note that this macro can only be used together with the
+ * G_DEFINE_DYNAMIC_TYPE_EXTENDED macros, since it depends on variable
+ * names from that macro.
+ *
+ * Since: 2.24
+ */
+#define G_IMPLEMENT_INTERFACE_DYNAMIC(TYPE_IFACE, iface_init)       { \
+  const GInterfaceInfo g_implement_interface_info = { \
+    iface_init, NULL, NULL \
+  }; \
+  g_type_module_add_interface (type_module, g_define_type_id, TYPE_IFACE, &g_implement_interface_info); \
+}
 
 GType    g_type_module_get_type       (void) G_GNUC_CONST;
 gboolean g_type_module_use            (GTypeModule          *module);