AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make GtkComboBox work without model. (#144198, Mariano Suárez-Alvarez)

Browse Source 
Tue Jun 15 01:10:32 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c: Make GtkComboBox work without model.
	(#144198, Mariano Suárez-Alvarez)
This commit is contained in:
Matthias Clasen 2004-06-15 05:12:27 +00:00 committed by Matthias Clasen
parent 9bff92fbcd
commit 3d8b7d14db
5 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jun 15 01:10:32 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.
(#144198, Mariano Suárez-Alvarez)
Fri Jun 11 22:05:56 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkfilechooserdefault.c: Don't use

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Tue Jun 15 01:10:32 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.
(#144198, Mariano Suárez-Alvarez)
Fri Jun 11 22:05:56 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkfilechooserdefault.c: Don't use

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Tue Jun 15 01:10:32 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.
(#144198, Mariano Suárez-Alvarez)
Fri Jun 11 22:05:56 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkfilechooserdefault.c: Don't use

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Tue Jun 15 01:10:32 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c: Make GtkComboBox work without model.
(#144198, Mariano Suárez-Alvarez)
Fri Jun 11 22:05:56 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkfilechooserdefault.c: Don't use

20
gtk/gtkcombobox.c
View File

@ -2608,10 +2608,13 @@ gtk_combo_box_key_press (GtkWidget *widget,
{
GtkComboBox *combo_box = GTK_COMBO_BOX (data);
guint state = event->state & gtk_accelerator_get_default_mod_mask ();
gint items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
gint items = 0;
gint index = gtk_combo_box_get_active (combo_box);
gint new_index;
if (combo_box->priv->model)
items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) &&
state == GDK_MOD1_MASK)
{
@ -2657,8 +2660,9 @@ gtk_combo_box_key_press (GtkWidget *widget,
default:
return FALSE;
}
gtk_combo_box_set_active (combo_box, CLAMP (new_index, 0, items - 1));
if (items > 0)
gtk_combo_box_set_active (combo_box, CLAMP (new_index, 0, items - 1));
return TRUE;
}
@ -2706,12 +2710,16 @@ gtk_combo_box_list_key_press (GtkWidget *widget,
if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
event->keyval == GDK_space || event->keyval == GDK_KP_Space)
{
gboolean ret;
gboolean ret = FALSE;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
ret = gtk_tree_selection_get_selected (sel, &model, &iter);
if (combo_box->priv->model)
{
GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
ret = gtk_tree_selection_get_selected (sel, &model, &iter);
}
if (ret)
{
GtkTreePath *path;