[gtk/wip/baedert/for-master] fontchooser: Fix radio groups for features

[Matthias Clasen <matthiasc src gnome org>]

commit 0ccb5d02f77b2aaa26b3bdbbbb7645fe05e078b8
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 30 16:41:02 2020 -0400

    fontchooser: Fix radio groups for features
    
    We need to use grouped checkbuttons now.

 gtk/gtkfontchooserwidget.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index e26fa3037b..8c2040d47c 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -1658,10 +1658,11 @@ add_radio_group (GtkFontChooserWidget *fontchooser,
       tag = hb_tag_from_string (tags[i], -1);
       name = get_feature_display_name (tag);
 
-      feat = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (group_button),
-                                                          name ? name : _("Default"));
+      feat = gtk_check_button_new_with_label (name ? name : _("Default"));
       if (group_button == NULL)
         group_button = feat;
+      else
+        gtk_check_button_set_group (GTK_CHECK_BUTTON (feat), GTK_CHECK_BUTTON (group_button));
 
       g_signal_connect_swapped (feat, "notify::active", G_CALLBACK (update_font_features), fontchooser);
       g_object_set_data (G_OBJECT (feat), "default", group_button);
@@ -1786,14 +1787,17 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
 
               update_feature_example (item, hb_font, script_tag, lang_tag, fontchooser->font_desc);
 
-              if (GTK_IS_RADIO_BUTTON (item->feat))
+              if (GTK_IS_CHECK_BUTTON (item->feat))
                 {
                   GtkWidget *def = GTK_WIDGET (g_object_get_data (G_OBJECT (item->feat), "default"));
-                  gtk_widget_show (gtk_widget_get_parent (def));
-                }
-              else if (GTK_IS_CHECK_BUTTON (item->feat))
-                {
-                  set_inconsistent (GTK_CHECK_BUTTON (item->feat), TRUE);
+                  if (def)
+                    {
+                      gtk_widget_show (def);
+                      gtk_widget_show (gtk_widget_get_parent (def));
+                      gtk_check_button_set_active (GTK_CHECK_BUTTON (def), TRUE);
+                    }
+                  else
+                    set_inconsistent (GTK_CHECK_BUTTON (item->feat), TRUE);
                 }
             }
         }