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

filechooser: Fix gtk_file_chooser_set_choice

Browse Source 
This broke when it was ported to GtkDropDown.
This commit is contained in:
Matthias Clasen 2020-09-20 12:01:52 -04:00
parent ee75bae8f8
commit 1d34f955a2
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkfilechooserwidget.c
View File

@ -7933,7 +7933,9 @@ gtk_file_chooser_widget_add_choice (GtkFileChooser *chooser,
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_append (GTK_BOX (box), gtk_label_new (label));
combo = gtk_drop_down_new_from_strings ((const char * const *)options);
combo = gtk_drop_down_new_from_strings ((const char * const *)option_labels);
g_object_set_data_full (G_OBJECT (combo), "options",
g_strdupv ((char **)options), (GDestroyNotify)g_strfreev);
g_hash_table_insert (impl->choices, g_strdup (id), combo);
gtk_box_append (GTK_BOX (box), combo);
@ -7988,19 +7990,20 @@ gtk_file_chooser_widget_set_choice (GtkFileChooser *chooser,
widget = (GtkWidget *)g_hash_table_lookup (impl->choices, id);
if (GTK_IS_DROP_DOWN (widget))
if (GTK_IS_BOX (widget))
{
guint i, n;
GListModel *model;
guint i;
const char **choices;
GtkWidget *dropdown;
model = gtk_drop_down_get_model (GTK_DROP_DOWN (widget));
n = g_list_model_get_n_items (model);
for (i = 0; i < n; i++)
dropdown = gtk_widget_get_last_child (widget);
choices = (const char **) g_object_get_data (G_OBJECT (dropdown), "choices");
for (i = 0; choices[i]; i++)
{
const char *string = gtk_string_list_get_string (GTK_STRING_LIST (model), i);
if (strcmp (string, option) == 0)
if (strcmp (option, choices[i]) == 0)
{
gtk_drop_down_set_selected (GTK_DROP_DOWN (widget), i);
gtk_drop_down_set_selected (GTK_DROP_DOWN (dropdown), i);
break;
}
}