luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 15:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add g_type_register_static_simple

Browse Source
This commit is contained in:
Matthias Clasen 2006-04-21 16:53:02 +00:00
parent 5aa4c5ef6d
commit 2e57b11a94
4 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gobject/ChangeLog
View File

@ -1,3 +1,11 @@
2006-04-21 Matthias Clasen <mclasen@redhat.com>
* gobject.symbols:
* gtype.[hc]: Add a g_type_register_static_simple
variant of g_type_register_static that does not take
a relocation-causing GTypeInfo struct, and use it
in G_DEFINE_TYPE.
2006-03-07 Matthias Clasen <mclasen@redhat.com> 2006-03-07 Matthias Clasen <mclasen@redhat.com>
* === Released 2.10.1 === * === Released 2.10.1 ===

1
gobject/gobject.symbols
View File

@ -16,6 +16,7 @@
g_boxed_copy g_boxed_copy
g_boxed_free g_boxed_free
g_boxed_type_register_static g_boxed_type_register_static
g_boxed_type_register_static_simple
g_date_get_type G_GNUC_CONST g_date_get_type G_GNUC_CONST
g_gstring_get_type G_GNUC_CONST g_gstring_get_type G_GNUC_CONST
g_strv_get_type G_GNUC_CONST g_strv_get_type G_GNUC_CONST

25
gobject/gtype.c
View File

@ -2203,6 +2203,31 @@ g_type_register_fundamental (GType type_id,
return NODE_TYPE (node); return NODE_TYPE (node);
} }
GType
g_type_register_static_simple (GType parent_type,
const gchar *type_name,
guint class_size,
GClassInitFunc class_init,
guint instance_size,
GInstanceInitFunc instance_init,
GTypeFlags flags)
{
GTypeInfo info;
info.class_size = class_size;
info.base_init = NULL;
info.base_finalize = NULL;
info.class_init = class_init;
info.class_finalize = NULL;
info.class_data = NULL;
info.instance_size = instance_size;
info.n_preallocs = 0;
info.instance_init = instance_init;
info.value_table = NULL;
g_type_register_static (parent_type, type_name, &info, flags);
}
GType GType
g_type_register_static (GType parent_type, g_type_register_static (GType parent_type,
const gchar *type_name, const gchar *type_name,

25
gobject/gtype.h
View File

@ -287,6 +287,14 @@ GType g_type_register_static (GType parent_type,
const gchar *type_name, const gchar *type_name,
const GTypeInfo *info, const GTypeInfo *info,
GTypeFlags flags); GTypeFlags flags);
GType g_type_register_static_simple (GType parent_type,
const gchar *type_name,
guint class_size,
GClassInitFunc class_init,
guint instance_size,
GInstanceInitFunc instance_init,
GTypeFlags flags);
GType g_type_register_dynamic (GType parent_type, GType g_type_register_dynamic (GType parent_type,
const gchar *type_name, const gchar *type_name,
GTypePlugin *plugin, GTypePlugin *plugin,
@ -362,19 +370,14 @@ type_name##_get_type (void) \
static GType g_define_type_id = 0; \ static GType g_define_type_id = 0; \
if (G_UNLIKELY (g_define_type_id == 0)) \ if (G_UNLIKELY (g_define_type_id == 0)) \
{ \ { \
static const GTypeInfo g_define_type_info = { \ g_define_type_id = \
g_type_register_static_simple (TYPE_PARENT, \
g_intern_static_string (#TypeName), \
sizeof (TypeName##Class), \ sizeof (TypeName##Class), \
(GBaseInitFunc) NULL, \ type_name##_class_intern_init, \
(GBaseFinalizeFunc) NULL, \
(GClassInitFunc) type_name##_class_intern_init, \
(GClassFinalizeFunc) NULL, \
NULL, /* class_data */ \
sizeof (TypeName), \ sizeof (TypeName), \
0, /* n_preallocs */ \ type_name##_init, \
(GInstanceInitFunc) type_name##_init, \ (GTypeFlags) flags); \
NULL /* value_table */ \
}; \
g_define_type_id = g_type_register_static (TYPE_PARENT, g_intern_static_string (#TypeName), &g_define_type_info, (GTypeFlags) flags); \
{ CODE ; } \ { CODE ; } \
} \ } \
return g_define_type_id; \ return g_define_type_id; \