diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2007-06-27 18:07:50 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2007-06-27 18:07:50 +0000 |
| commit | ec3bb3775915004fea3b51687814646ddfc7ea71 (patch) | |
| tree | 1eaba94ccb6c6dde40581d6074735bace74e5348 /gtk/gtkbuilder.h | |
| parent | 2fc1ae81344ec4bd58b5a505c11c444bec363077 (diff) | |
| download | gtk+-ec3bb3775915004fea3b51687814646ddfc7ea71.tar.gz | |
Add GtkBuilder and GError arguments to gtk_builder_value_from_string and
* gtk/gtkbuilder.c: (gtk_builder_get_parameters),
(gtk_builder_value_from_string),
(gtk_builder_value_from_string_type):
* gtk/gtkbuilder.h:
* gtk/gtkcontainer.c: (gtk_container_buildable_set_child_property),
(attributes_text_element):
* gtk/gtkliststore.c: (list_store_text):
* tests/buildertest.c: (test_value_from_string):
Add GtkBuilder and GError arguments to gtk_builder_value_from_string
and gtk_builder_value_from_string_type. (#451428)
svn path=/trunk/; revision=18262
Diffstat (limited to 'gtk/gtkbuilder.h')
| -rw-r--r-- | gtk/gtkbuilder.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h index 36348b25ac..0886d2a2d1 100644 --- a/gtk/gtkbuilder.h +++ b/gtk/gtkbuilder.h @@ -44,7 +44,8 @@ typedef enum GTK_BUILDER_ERROR_MISSING_ATTRIBUTE, GTK_BUILDER_ERROR_INVALID_ATTRIBUTE, GTK_BUILDER_ERROR_INVALID_TAG, - GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE + GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE, + GTK_BUILDER_ERROR_INVALID_VALUE } GtkBuilderError; GQuark gtk_builder_error_quark (void); @@ -106,12 +107,16 @@ const gchar* gtk_builder_get_translation_domain (GtkBuilder *builder); GType gtk_builder_get_type_from_name (GtkBuilder *builder, const char *type_name); -gboolean gtk_builder_value_from_string (GParamSpec *pspec, +gboolean gtk_builder_value_from_string (GtkBuilder *builder, + GParamSpec *pspec, const gchar *string, - GValue *value); -gboolean gtk_builder_value_from_string_type (GType type, + GValue *value, + GError **error); +gboolean gtk_builder_value_from_string_type (GtkBuilder *builder, + GType type, const gchar *string, - GValue *value); + GValue *value, + GError **error); guint _gtk_builder_flags_from_string (GType type, const char *string); |