From ac0b13e47f247e48e36166a714a45447d4b93ccf Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 13 Nov 2001 19:02:40 +0000 Subject: [PATCH] fix standard type macros. Tue Nov 13 20:02:47 2001 Tim Janik * gparam.h: fix standard type macros. --- gobject/ChangeLog | 4 ++++ gobject/gparam.h | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index d344bf5..8874139 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +Tue Nov 13 20:02:47 2001 Tim Janik + + * gparam.h: fix standard type macros. + Wed Nov 7 00:56:00 2001 Tim Janik * gclosure.h: provide G_CLOSURE_N_NOTIFIERS() for people that need diff --git a/gobject/gparam.h b/gobject/gparam.h index 8d6ebe1..02784af 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -26,13 +26,18 @@ G_BEGIN_DECLS -/* --- type macros --- */ +/* --- standard type macros --- */ #define G_TYPE_IS_PARAM(type) (G_TYPE_FUNDAMENTAL (type) == G_TYPE_PARAM) -#define G_PARAM_SPEC_TYPE(pspec) (G_TYPE_FROM_INSTANCE (pspec)) -#define G_PARAM_SPEC_TYPE_NAME(pspec) (g_type_name (G_PARAM_SPEC_TYPE (pspec))) #define G_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec)) #define G_IS_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM)) +#define G_PARAM_SPEC_CLASS(pclass) (G_TYPE_CHECK_CLASS_CAST ((pclass), G_TYPE_PARAM, GParamSpecClass)) +#define G_IS_PARAM_SPEC_CLASS(pclass) (G_TYPE_CHECK_CLASS_TYPE ((pclass), G_TYPE_PARAM)) #define G_PARAM_SPEC_GET_CLASS(pspec) (G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass)) + + +/* --- convenience macros --- */ +#define G_PARAM_SPEC_TYPE(pspec) (G_TYPE_FROM_INSTANCE (pspec)) +#define G_PARAM_SPEC_TYPE_NAME(pspec) (g_type_name (G_PARAM_SPEC_TYPE (pspec))) #define G_PARAM_SPEC_VALUE_TYPE(pspec) (G_PARAM_SPEC (pspec)->value_type) #define G_VALUE_HOLDS_PARAM(value) (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_PARAM)) -- 2.7.4