diff options
author | Tim Janik <timj@gtk.org> | 2000-10-25 20:36:35 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 2000-10-25 20:36:35 +0000 |
commit | ee23c09e83d06a0d131ebd234c132f1c3602c019 (patch) | |
tree | b24f3cdd0758fed1a483abc645936ebae963b898 /gobject/gvalue.c | |
parent | b13320f78ba3b484a26b6430152b35aaac24ff10 (diff) |
added newly added gobject/ headers.
Tue Oct 24 22:09:14 2000 Tim Janik <timj@gtk.org>
* glib-object.h: added newly added gobject/ headers.
* gmesage.c: print g_message() output to stderr instead of stdout.
Wed Oct 25 20:27:02 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_free_instance): for the moment, freeing object
structures will fill their memory portion with 0xAA. there's a
FIXME there, remove this line at a later point.
Tue Oct 24 23:10:26 2000 Tim Janik <timj@gtk.org>
* glib-genmarshal.1:
* glib-genmarshal.c: added publically installed marshaller generator.
* gtype.h: added G_TYPE_INSTANCE_GET_INTERFACE() to retrive a certain
interface VTable from instances.
Mon Oct 23 08:28:15 2000 Tim Janik <timj@gtk.org>
* gobject.[hc]: new functions for closure maintenance:
(g_object_watch_closure): maintain validity of the object and
the closure for objects that are used as data part of a closure.
(g_cclosure_new_object): convenience function to create C closures
that have an object as data argument.
(g_closure_new_object): convenience function to create closures
that have an object as data argument.
* gclosure.[hc]: implementation of GClosure mechanism.
a closure is basically an encapsulation of a callback function
and its environment. ideally, most places supporting callback
functions will simply take a GClosure* pointer and thus unify
callback environments wrg destroy notification etc.
GClosure provides destroy notifiers for arbitrary data pointers,
reference counting, invalidation notification (it can be invalidated
which is merely a deactivate state) and a marshallinbg abstraction.
GCClosure is also provided in these files, they present a specialized
GClosure implementation for C language callbacks.
* genum.c: macro cleanups.
* gboxed.[hc]: new files, for boxed type abstraction.
(g_boxed_copy): copy a boxed structure
(g_boxed_free): free a boxed structure
(g_value_set_boxed):
(g_value_get_boxed): standard GValue functions for boxed types
(g_boxed_type_register_static): convenience function for easy
introduction of new G_TYPE_BOXED derivatives.
* gparam.[hc]: introduced g_param_type_register_static(), a short hand
for creation of new GParamSpec derived types.
* gtype.[hc]: many fixes, introduced ability to flag individual
type nodes as ABSTRACT upon registration, added value_peek_pointer()
to the value table to peek at GValue contents as a pointer for types
that support this. fixed up GValue checks.
* gvalue.[hc]: added g_value_fits_pointer() and g_value_get_as_pointer()
to peek at the value contents as pointer.
* *.[hc]: adaptions to type macro fixes and changes in the type
registration API.
* many const corrections over the place.
Sat Oct 21 02:49:56 2000 Tim Janik <timj@gtk.org>
* gtype.c (g_type_conforms_to): this function basically behaves like
and is_a check, except that it _additionally_ features interfaces
for instantiatable types. enforce this in the second branch as well
(`type' conforms_to `type') even if `type' is not an interface type.
Fri Oct 20 15:31:04 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added G_TYPE_POINTER implementation from jrb.
* gtype.[hc]:
* gobject.c:
* gvaluetypes.c: added GTypeValueTable.value_peek_pointer and
suitable implementations of this for G_TYPE_STRING, G_TYPE_OBJECT
and G_TYPE_POINTER.
Mon Aug 21 04:13:37 2000 Tim Janik <timj@gtk.org>
* gbsearcharray.[hc]: long standing needed generic implementation
of a binary searchable, sorted and dynamically sized array.
Diffstat (limited to 'gobject/gvalue.c')
-rw-r--r-- | gobject/gvalue.c | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/gobject/gvalue.c b/gobject/gvalue.c index bdc0a9c9f..40938009e 100644 --- a/gobject/gvalue.c +++ b/gobject/gvalue.c @@ -61,11 +61,13 @@ void g_value_copy (const GValue *src_value, GValue *dest_value) { - GTypeValueTable *value_table = g_type_value_table_peek (G_VALUE_TYPE (dest_value)); + GTypeValueTable *value_table; g_return_if_fail (G_IS_VALUE (src_value)); g_return_if_fail (G_IS_VALUE (dest_value)); g_return_if_fail (g_type_is_a (G_VALUE_TYPE (src_value), G_VALUE_TYPE (dest_value))); + + value_table = g_type_value_table_peek (G_VALUE_TYPE (dest_value)); if (!value_table) g_return_if_fail (g_type_value_table_peek (G_VALUE_TYPE (dest_value)) != NULL); @@ -78,6 +80,36 @@ g_value_copy (const GValue *src_value, } } +gboolean +g_value_fits_pointer (const GValue *value) +{ + GTypeValueTable *value_table; + + g_return_val_if_fail (G_IS_VALUE (value), FALSE); + + value_table = g_type_value_table_peek (G_VALUE_TYPE (value)); + if (!value_table) + g_return_val_if_fail (g_type_value_table_peek (G_VALUE_TYPE (value)) != NULL, FALSE); + + return value_table->value_peek_pointer != NULL; +} + +gpointer +g_value_get_as_pointer (const GValue *value) +{ + GTypeValueTable *value_table; + + g_return_val_if_fail (G_IS_VALUE (value), NULL); + + value_table = g_type_value_table_peek (G_VALUE_TYPE (value)); + if (!value_table) + g_return_val_if_fail (g_type_value_table_peek (G_VALUE_TYPE (value)) != NULL, NULL); + if (!value_table->value_peek_pointer) + g_return_val_if_fail (g_value_fits_pointer (value) == TRUE, NULL); + + return value_table->value_peek_pointer (value); +} + void g_value_unset (GValue *value) { @@ -189,8 +221,8 @@ g_value_register_exchange_func (GType value_type1, { ExchangeEntry entry; - g_return_if_fail (G_TYPE_IS_VALUE (value_type1)); - g_return_if_fail (G_TYPE_IS_VALUE (value_type2)); + g_return_if_fail (g_type_name (value_type1) != NULL); + g_return_if_fail (g_type_name (value_type2) != NULL); g_return_if_fail (func != NULL); entry.value_type1 = MIN (value_type1, value_type2); @@ -218,7 +250,7 @@ gboolean g_value_types_exchangable (GType value_type1, GType value_type2) { - g_return_val_if_fail (G_TYPE_IS_VALUE (value_type1), FALSE); + g_return_val_if_fail (G_TYPE_IS_VALUE (value_type1), FALSE); /* these might bite us, think G_TYPE_ENUM */ g_return_val_if_fail (G_TYPE_IS_VALUE (value_type2), FALSE); return exchange_func_lookup (value_type1, value_type2, NULL) != NULL; |