* The entry itself can be accessed by calling gtk_bin_get_child() on the
* combo box.
*
+ * You should not call gtk_combo_box_set_model() or attempt to pack more cells
+ * into this combo box via its GtkCellLayout interface.
+ *
* <refsect2 id="GtkComboBoxText-BUILDER-UI">
* <title>GtkComboBoxText as GtkBuildable</title>
* <para>
* The GtkComboBoxText implementation of the GtkBuildable interface
- * supports adding items directly using the <items> element
- * and specifying <item> elements for each item. Each <item>
+ * supports adding items directly using the <items> element
+ * and specifying <item> elements for each item. Each <item>
* element supports the regular translation attributes "translatable",
* "context" and "comments".
*
* </object>
* ]]></programlisting>
* </example>
- *
+ * </para>
+ * </refsect2>
*/
static void gtk_combo_box_text_buildable_interface_init (GtkBuildableIface *iface);
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
- GObject *object;
+ GObject *object;
+ const gint text_column = 0;
object = G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructor
(type, n_construct_properties, construct_properties);
+ gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (object), text_column);
+ gtk_combo_box_set_id_column (GTK_COMBO_BOX (object), 1);
+
if (!gtk_combo_box_get_has_entry (GTK_COMBO_BOX (object)))
{
GtkCellRenderer *cell;
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell,
- "text", 0,
+ "text", text_column,
NULL);
}
GtkBuilder *builder;
GObject *object;
const gchar *domain;
+ gchar *id;
+
+ GString *string;
gchar *context;
- gchar *string;
guint translatable : 1;
guint is_text : 1;
}
else if (strcmp (names[i], "context") == 0)
data->context = g_strdup (values[i]);
+ else if (strcmp (names[i], "id") == 0)
+ data->id = g_strdup (values[i]);
else
g_warning ("Unknown custom combo box item attribute: %s", names[i]);
}
GError **error)
{
ItemParserData *data = (ItemParserData*)user_data;
- gchar *string;
-
- if (!data->is_text)
- return;
-
- string = g_strndup (text, text_len);
-
- if (data->translatable && text_len)
- {
- gchar *translated;
-
- /* FIXME: This will not use the domain set in the .ui file,
- * since the parser is not telling the builder about the domain.
- * However, it will work for gtk_builder_set_translation_domain() calls.
- */
- translated = _gtk_builder_parser_translate (data->domain,
- data->context,
- string);
- g_free (string);
- string = translated;
- }
- data->string = string;
+ if (data->is_text)
+ g_string_append_len (data->string, text, text_len);
}
static void
ItemParserData *data = (ItemParserData*)user_data;
/* Append the translated strings */
- if (data->string)
- gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (data->object), data->string);
+ if (data->string->len)
+ {
+ if (data->translatable)
+ {
+ gchar *translated;
+
+ /* FIXME: This will not use the domain set in the .ui file,
+ * since the parser is not telling the builder about the domain.
+ * However, it will work for gtk_builder_set_translation_domain() calls.
+ */
+ translated = _gtk_builder_parser_translate (data->domain,
+ data->context,
+ data->string->str);
+ g_string_set_size (data->string, 0);
+ g_string_append (data->string, translated);
+ }
+
+ gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (data->object), data->id, data->string->str);
+ }
data->translatable = FALSE;
+ g_string_set_size (data->string, 0);
g_free (data->context);
- g_free (data->string);
data->context = NULL;
- data->string = NULL;
+ g_free (data->id);
+ data->id = NULL;
data->is_text = FALSE;
}
parser_data->builder = g_object_ref (builder);
parser_data->object = g_object_ref (buildable);
parser_data->domain = gtk_builder_get_translation_domain (builder);
+ parser_data->string = g_string_new ("");
*parser = item_parser;
*data = parser_data;
return TRUE;
g_object_unref (data->object);
g_object_unref (data->builder);
+ g_string_free (data->string, TRUE);
g_slice_free (ItemParserData, data);
}
}
* gtk_combo_box_text_new:
*
* Creates a new #GtkComboBoxText, which is a #GtkComboBox just displaying
- * strings. See gtk_combo_box_entry_new_with_text().
+ * strings.
*
* Return value: A new #GtkComboBoxText
*
gtk_combo_box_text_new (void)
{
return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
- "entry-text-column", 0,
- "id-column", 1,
NULL);
}
{
return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
"has-entry", TRUE,
- "entry-text-column", 0,
- "id-column", 1,
NULL);
}
/**
* gtk_combo_box_text_append:
* @combo_box: A #GtkComboBoxText
+ * @id: (allow-none): a string ID for this value, or %NULL
* @text: A string
*
- * Appends @text to the list of strings stored in @combo_box. If @id is
- * non-%NULL then it is used as the ID of the row.
+ * Appends @text to the list of strings stored in @combo_box.
+ * If @id is non-%NULL then it is used as the ID of the row.
*
* This is the same as calling gtk_combo_box_text_insert() with a
* position of -1.
* @id: (allow-none): a string ID for this value, or %NULL
* @text: a string
*
- * Prepends @text to the list of strings stored in @combo_box. If @id
- * is non-%NULL then it is used as the ID of the row.
+ * Prepends @text to the list of strings stored in @combo_box.
+ * If @id is non-%NULL then it is used as the ID of the row.
*
* This is the same as calling gtk_combo_box_text_insert() with a
* position of 0.
*
* Inserts @text at @position in the list of strings stored in @combo_box.
* If @id is non-%NULL then it is used as the ID of the row. See
- * #GtkComboBox::id-column.
+ * #GtkComboBox:id-column.
*
* If @position is negative then @text is appended.
*
* gtk_combo_box_text_get_active_text:
* @combo_box: A #GtkComboBoxText
*
- * Returns the currently active string in @combo_box, or %NULL if none
- * is selected. If @combo_box contains an entry, this function will return
- * its contents (which will not necessarily be an item from the list).
+ * Returns the currently active string in @combo_box, or %NULL
+ * if none is selected. If @combo_box contains an entry, this
+ * function will return its contents (which will not necessarily
+ * be an item from the list).
*
- * Returns: a newly allocated string containing the currently active text.
- * Must be freed with g_free().
+ * Returns: (transfer full): a newly allocated string containing the
+ * currently active text. Must be freed with g_free().
*
* Since: 2.24
*/
g_return_val_if_fail (GTK_IS_COMBO_BOX_TEXT (combo_box), NULL);
- if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
+ if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo_box)))
+ {
+ GtkWidget *entry;
+
+ entry = gtk_bin_get_child (GTK_BIN (combo_box));
+ text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+ }
+ else if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter))
{
GtkTreeModel *model;
gint text_column;
projects / ~andy / gtk / blobdiff