AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 09:00:34 +00:00
Code Issues Projects Releases Wiki Activity

comboboxtext: Set entry-text-column and id-column props in the constructor

Browse Source 
This is cleaner than setting the value in the _new() functions and
makes binding and GtkBuilder instantiation easier. Bug #612396, comment 65.
This commit is contained in:
Kjell Ahlstedt 2011-12-28 16:32:32 +01:00
parent d273b817e8
commit 6aeab7b7cc
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcomboboxtext.c
View File

@ -49,6 +49,9 @@
* The entry itself can be accessed by calling gtk_bin_get_child() on the * The entry itself can be accessed by calling gtk_bin_get_child() on the
* combo box. * 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"> * <refsect2 id="GtkComboBoxText-BUILDER-UI">
* <title>GtkComboBoxText as GtkBuildable</title> * <title>GtkComboBoxText as GtkBuildable</title>
* <para> * <para>
@ -100,10 +103,14 @@ gtk_combo_box_text_constructor (GType type,
GObjectConstructParam *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 object = G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructor
(type, n_construct_properties, construct_properties); (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))) if (!gtk_combo_box_get_has_entry (GTK_COMBO_BOX (object)))
{ {
GtkCellRenderer *cell; GtkCellRenderer *cell;
@ -111,7 +118,7 @@ gtk_combo_box_text_constructor (GType type,
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (object), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (object), cell,
"text", 0, "text", text_column,
NULL); NULL);
} }
@ -309,7 +316,7 @@ gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable,
* gtk_combo_box_text_new: * gtk_combo_box_text_new:
* *
* Creates a new #GtkComboBoxText, which is a #GtkComboBox just displaying * 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 * Return value: A new #GtkComboBoxText
* *
@ -319,8 +326,6 @@ GtkWidget *
gtk_combo_box_text_new (void) gtk_combo_box_text_new (void)
{ {
return g_object_new (GTK_TYPE_COMBO_BOX_TEXT, return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
"entry-text-column", 0,
"id-column", 1,
NULL); NULL);
} }
@ -339,8 +344,6 @@ gtk_combo_box_text_new_with_entry (void)
{ {
return g_object_new (GTK_TYPE_COMBO_BOX_TEXT, return g_object_new (GTK_TYPE_COMBO_BOX_TEXT,
"has-entry", TRUE, "has-entry", TRUE,
"entry-text-column", 0,
"id-column", 1,
NULL); NULL);
} }