Merge branch 'property-selection-getters' into 'master'

propertyselection: Add getters

See merge request GNOME/gtk!2075
This commit is contained in:
Matthias Clasen 2020-06-11 13:08:47 +00:00
commit 93017bb8db
3 changed files with 50 additions and 10 deletions

View File

@ -409,6 +409,8 @@ gtk_multi_selection_get_type
<TITLE>GtkPropertySelection</TITLE>
GtkPropertySelection
gtk_property_selection_new
gtk_property_selection_get_model
gtk_property_selection_get_property
<SUBSECTION Private>
gtk_property_selection_get_type
</SECTION>

View File

@ -355,7 +355,7 @@ gtk_property_selection_clear_model (GtkPropertySelection *self)
}
static void
gtk_property_selection_set_property (GObject *object,
gtk_property_selection_real_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
@ -399,7 +399,7 @@ gtk_property_selection_set_property (GObject *object,
}
static void
gtk_property_selection_get_property (GObject *object,
gtk_property_selection_real_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
@ -439,8 +439,8 @@ gtk_property_selection_class_init (GtkPropertySelectionClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gtk_property_selection_get_property;
gobject_class->set_property = gtk_property_selection_set_property;
gobject_class->get_property = gtk_property_selection_real_get_property;
gobject_class->set_property = gtk_property_selection_real_set_property;
gobject_class->dispose = gtk_property_selection_dispose;
/**
@ -497,3 +497,36 @@ gtk_property_selection_new (GListModel *model,
"property", property,
NULL);
}
/**
* gtk_property_selection_get_model:
* @self: a #GtkPropertySelection
*
* Gets the underlying model.
*
* Returns: (transfer none): the underlying model
*/
GListModel *
gtk_property_selection_get_model (GtkPropertySelection *self)
{
g_return_val_if_fail (GTK_IS_PROPERTY_SELECTION (self), NULL);
return self->model;
}
/**
* gtk_property_selection_get_property:
* @self: a #GtkPropertySelection
*
* Gets the name of the item property that @self stores
* the selection in.
*
* Returns: the name of the property
*/
const char *
gtk_property_selection_get_property (GtkPropertySelection *self)
{
g_return_val_if_fail (GTK_IS_PROPERTY_SELECTION (self), NULL);
return self->property;
}

View File

@ -34,6 +34,11 @@ GDK_AVAILABLE_IN_ALL
GListModel * gtk_property_selection_new (GListModel *model,
const char *property);
GDK_AVAILABLE_IN_ALL
GListModel * gtk_property_selection_get_model (GtkPropertySelection *self);
GDK_AVAILABLE_IN_ALL
const char * gtk_property_selection_get_property (GtkPropertySelection *self);
G_END_DECLS