diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-03-22 02:14:55 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-03-22 02:14:55 +0000 |
| commit | 269d89c79c9e8e872b3599242d1e174afeab4b00 (patch) | |
| tree | 6222a134a586bb5107fd7d58af9c83274f4d313a /gtk/gtkobject.c | |
| parent | 8d752a5587abfda1a14298e56cdffb90b4ab21de (diff) | |
| download | gtk+-269d89c79c9e8e872b3599242d1e174afeab4b00.tar.gz | |
Define macros GTK_PARAM_READABLE, GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE
2005-03-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprivate.h: Define macros GTK_PARAM_READABLE,
GTK_PARAM_WRITABLE, GTK_PARAM_READWRITE which are like
their G_ counterparts, but also mark the name, nick
and blurb as static.
* gtk/*.c: Mark param spec strings as static, using
the new macros.
Diffstat (limited to 'gtk/gtkobject.c')
| -rw-r--r-- | gtk/gtkobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index e2e2b733e6..38fe200062 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -31,6 +31,7 @@ #include "gtkobject.h" #include "gtkmarshalers.h" #include "gtksignal.h" +#include "gtkprivate.h" #include "gtkalias.h" @@ -228,7 +229,7 @@ gtk_object_add_arg_type (const gchar *arg_name, g_return_if_fail ((arg_flags & G_PARAM_CONSTRUCT_ONLY) == 0); if (arg_flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) g_return_if_fail (arg_flags & G_PARAM_WRITABLE); - g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY)) == 0); + g_return_if_fail ((arg_flags & ~(G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME)) == 0); pname = strchr (arg_name, ':'); g_return_if_fail (pname && pname[1] == ':'); @@ -330,7 +331,7 @@ gtk_object_class_init (GtkObjectClass *class) PROP_USER_DATA, g_param_spec_pointer ("user-data", "User Data", "Anonymous User Data Pointer", - G_PARAM_READABLE | G_PARAM_WRITABLE)); + GTK_PARAM_READWRITE)); object_signals[DESTROY] = g_signal_new ("destroy", G_TYPE_FROM_CLASS (gobject_class), |