diff options
author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2011-04-01 19:35:32 -0300 |
---|---|---|
committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2011-04-01 19:35:32 -0300 |
commit | a77e6b1593217dd688414c1d1abee85145b94ec6 (patch) | |
tree | f2e5a2f743afe09bed662bf87f522e45003535f9 /gtk/gtkentry.c | |
parent | f344bc26ad033632dad22bc920c20cd288da372b (diff) | |
download | gtk+-a77e6b1593217dd688414c1d1abee85145b94ec6.tar.gz |
Added GtkEntry:completion property
Diffstat (limited to 'gtk/gtkentry.c')
-rw-r--r-- | gtk/gtkentry.c | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 6dda7ecbf5..2732d30e97 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -309,7 +309,8 @@ enum { PROP_TOOLTIP_MARKUP_SECONDARY, PROP_IM_MODULE, PROP_EDITING_CANCELED, - PROP_PLACEHOLDER_TEXT + PROP_PLACEHOLDER_TEXT, + PROP_COMPLETION }; static guint signals[LAST_SIGNAL] = { 0 }; @@ -1330,6 +1331,21 @@ gtk_entry_class_init (GtkEntryClass *class) GTK_PARAM_READWRITE)); /** + * GtkEntry:completion: + * + * The auxiliary completion object to use with the entry. + * + * Since: 3.2 + */ + g_object_class_install_property (gobject_class, + PROP_COMPLETION, + g_param_spec_object ("completion", + P_("Completion"), + P_("The auxiliary completion object"), + GTK_TYPE_ENTRY_COMPLETION, + GTK_PARAM_READWRITE)); + + /** * GtkEntry:icon-prelight: * * The prelight style property determines whether activatable @@ -2094,6 +2110,10 @@ gtk_entry_set_property (GObject *object, priv->editing_canceled = g_value_get_boolean (value); break; + case PROP_COMPLETION: + gtk_entry_set_completion (entry, GTK_ENTRY_COMPLETION (g_value_get_object (value))); + break; + case PROP_SCROLL_OFFSET: case PROP_CURSOR_POSITION: default: @@ -2314,6 +2334,10 @@ gtk_entry_get_property (GObject *object, priv->editing_canceled); break; + case PROP_COMPLETION: + g_value_set_object (value, G_OBJECT (gtk_entry_get_completion (entry))); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -9957,6 +9981,8 @@ gtk_entry_set_completion (GtkEntry *entry, connect_completion_signals (entry, completion); completion->priv->entry = GTK_WIDGET (entry); g_object_set_data (G_OBJECT (entry), I_(GTK_ENTRY_COMPLETION_KEY), completion); + + g_object_notify (G_OBJECT (entry), "completion"); } /** |