columnview: Clarify docs

Mention that gtk_column_view_sort_by_column can be called multiple times to ste up complex sorting.
columnview: Reimplement column view sorting
2022-10-20 06:56:25 -04:00 · 2022-10-20 06:56:25 -04:00 · 2022-10-20 06:56:25 -04:00 · 2022-10-19 23:34:11 -04:00
461 changed files with 12146 additions and 18573 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,11 +51,8 @@ style-check-diff:
    reports:
      junit:
        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
-        - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml"
        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml"
        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
-        - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml"
    name: "gtk-${CI_COMMIT_REF_NAME}"
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -195,6 +192,7 @@ macos:
  only:
    - branches@GNOME/gtk
  stage: build
+  allow_failure: true
  tags:
    - macos
  needs: []
@@ -212,7 +210,6 @@ macos:
            -Dintrospection=disabled
            -Dcpp_std=c++11
            -Dpixman:tests=disabled
-            -Dlibjpeg-turbo:simd=disabled
            _build
    - ninja -C _build
  artifacts:
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -19,21 +19,11 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                --no-suite=gsk-compare-broadway

    # Store the exit code for the CI run, but always
    # generate the reports
    exit_code=$?
-
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
-          meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
    ;;

  wayland)
@@ -48,18 +38,9 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                --no-suite=gsk-compare-broadway
+
    exit_code=$?
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
    kill ${compositor}
    ;;

@@ -75,18 +56,9 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                --no-suite=gsk-compare-broadway
+
    exit_code=$?
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
    kill ${compositor}
    ;;

@@ -102,20 +74,10 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                --no-suite=gsk-compare-opengl

    # don't let Broadway failures fail the run, for now
    exit_code=0
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
    kill ${server}
    ;;

@@ -128,20 +90,18 @@ esac

 cd ${builddir}

-for suffix in "" "_unstable"; do
-    $srcdir/.gitlab-ci/meson-junit-report.py \
-            --project-name=gtk \
-            --backend="${backend}${suffix}" \
-            --job-id="${CI_JOB_NAME}" \
-            --output="report-${backend}${suffix}.xml" \
-            "meson-logs/testlog-${backend}${suffix}.json"
-    $srcdir/.gitlab-ci/meson-html-report.py \
-            --project-name=gtk \
-            --backend="${backend}${suffix}" \
-            --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${backend}${suffix}" \
-            --output="report-${backend}${suffix}.html" \
-            "meson-logs/testlog-${backend}${suffix}.json"
-done
+$srcdir/.gitlab-ci/meson-junit-report.py \
+        --project-name=gtk \
+        --backend=${backend} \
+        --job-id="${CI_JOB_NAME}" \
+        --output=report-${backend}.xml \
+        meson-logs/testlog-${backend}.json
+$srcdir/.gitlab-ci/meson-html-report.py \
+        --project-name=gtk \
+        --backend=${backend} \
+        --job-id="${CI_JOB_NAME}" \
+        --reftest-output-dir="testsuite/reftests/output/${backend}" \
+        --output=report-${backend}.html \
+        meson-logs/testlog-${backend}.json

 exit $exit_code
--- a/31
+++ b/31
@@ -1,14 +1,9 @@
-Overview of Changes in 4.9.2, xx-xx-xxxx
+Overview of Changes in 4.9.1, dd-mm-yyyy
 ========================================

-Overview of Changes in 4.9.1, 31-10-2022
-========================================
-
-Note that deprecations are an early outlook at changes
-that will appear in an eventual GTK 5 release, which is
-still far away. We are introducing deprecations in 4.10
-as a way to give users time to adapt, and to provide
-feedback on our plans.
+Note that deprecations are an early outlook
+at changes that will appear in an eventual
+GTK 5 release, which is still far away.

 * GtkTreeView, GtkIconView, GtkComboBox and
  auxiliary classes have been deprecated
@@ -20,21 +15,7 @@ feedback on our plans.
 * gtk_render_ and gtk_snapshot_render_ APIs
  have been deprecated

-* GtkAppChooser widgets have been deprecated
-
-* GtkMessageDialog has been deprecated and
-  replaced by a new async dialog API
-
-* GtkDialog has been deprecated
-
-* GtkColorChooser, GtkFontChooser, GtkFileChooser
-  interfaces and their implementations have been
-  deprecated. A new family of async dialog APIs
-  has been introduced to replace them
-
-* GtkColorDialog, GtkFontDialog, GtkFileDialog
-  and GtkAlertDialog are new dialog classes with
-  a consistent and well-bindable API
+* GtkAppChooser widgets hae been deprecated

 * GtkMountOperation:
 - Fix the dialog to look reasonable
@@ -51,8 +32,6 @@ feedback on our plans.
 - Make make debug options available in
   non-debug builds

-* Increase the memory limit for the jpeg loader to 1G
-
 * Translation updates:
 Abkhazian
 Basque
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -202,36 +202,43 @@ constraint_editor_window_load (ConstraintEditorWindow *self,
 }

 static void
-open_response_cb (GObject *source,
-                  GAsyncResult *result,
-                  void *user_data)
+open_response_cb (GtkNativeDialog        *dialog,
+                  int                     response,
+                  ConstraintEditorWindow *self)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  ConstraintEditorWindow *self = user_data;
-  GFile *file;
+  gtk_native_dialog_hide (dialog);

-  file = gtk_file_dialog_open_finish (dialog, result, NULL);
-  if (file)
+  if (response == GTK_RESPONSE_ACCEPT)
    {
+      GFile *file;
+
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      constraint_editor_window_load (self, file);
      g_object_unref (file);
    }
+
+  gtk_native_dialog_destroy (dialog);
 }

 static void
 open_cb (GtkWidget              *button,
         ConstraintEditorWindow *self)
 {
-  GtkFileDialog *dialog;
-  GFile *cwd;
+  GtkFileChooserNative *dialog;

-  dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_set_title (dialog, "Open file");
-  cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_current_folder (dialog, cwd);
+  dialog = gtk_file_chooser_native_new ("Open file",
+                                        GTK_WINDOW (self),
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+                                        "_Load",
+                                        "_Cancel");
+  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+
+  GFile *cwd = g_file_new_for_path (".");
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), cwd, NULL);
  g_object_unref (cwd);
-  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, NULL, open_response_cb, self);
-  g_object_unref (dialog);
+
+  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), self);
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }

 static void
@@ -287,23 +294,22 @@ serialize_model (GListModel *list)


 static void
-save_response_cb (GObject *source,
-                  GAsyncResult *result,
-                  void *user_data)
+save_response_cb (GtkNativeDialog        *dialog,
+                  int                     response,
+                  ConstraintEditorWindow *self)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  ConstraintEditorWindow *self = user_data;
-  GFile *file;
+  gtk_native_dialog_hide (dialog);

-  file = gtk_file_dialog_save_finish (dialog, result, NULL);
-  if (file)
+  if (response == GTK_RESPONSE_ACCEPT)
    {
      GListModel *model;
+      GFile *file;
      char *text;
      GError *error = NULL;

      model = constraint_view_get_model (CONSTRAINT_VIEW (self->view));
      text = serialize_model (model);
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      g_file_replace_contents (file, text, strlen (text),
                               NULL, FALSE,
                               G_FILE_CREATE_NONE,
@@ -312,39 +318,46 @@ save_response_cb (GObject *source,
                               &error);
      if (error != NULL)
        {
-          GtkAlertDialog *alert;
+          GtkWidget *message_dialog;

-          alert = gtk_alert_dialog_new ("Saving failed");
-          gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert,
-                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
-          g_object_unref (alert);
+          message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                                   GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_INFO,
+                                                   GTK_BUTTONS_OK,
+                                                   "Saving failed");
+          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
+                                                    "%s", error->message);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          gtk_widget_show (message_dialog);
          g_error_free (error);
        }

      g_free (text);
      g_object_unref (file);
    }
+
+  gtk_native_dialog_destroy (dialog);
 }

 static void
 save_cb (GtkWidget              *button,
         ConstraintEditorWindow *self)
 {
-  GtkFileDialog *dialog;
-  GFile *cwd;
+  GtkFileChooserNative *dialog;

-  dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_set_title (dialog, "Save constraints");
-  cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_current_folder (dialog, cwd);
+  dialog = gtk_file_chooser_native_new ("Save constraints",
+                                        GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
+                                        GTK_FILE_CHOOSER_ACTION_SAVE,
+                                        "_Save",
+                                        "_Cancel");
+  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+
+  GFile *cwd = g_file_new_for_path (".");
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), cwd, NULL);
  g_object_unref (cwd);
-  gtk_file_dialog_save (dialog,
-                        GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
-                        NULL, NULL,
-                        NULL,
-                        save_response_cb, self);
-  g_object_unref (dialog);
+
+  g_signal_connect (dialog, "response", G_CALLBACK (save_response_cb), self);
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }

 static void
@@ -427,7 +440,7 @@ edit_constraint (ConstraintEditorWindow *win,

  g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);

-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }

 static void
@@ -460,7 +473,7 @@ edit_guide (ConstraintEditorWindow *win,
  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));

  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }

 static void
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -33,12 +33,22 @@ static void create_window (GApplication *app, const char *contents);
 static void
 show_action_dialog (GSimpleAction *action)
 {
-  GtkAlertDialog *dialog;
+  const char *name;
+  GtkWidget *dialog;

-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
-                                 g_action_get_name (G_ACTION (action)));
-  gtk_alert_dialog_show (dialog, NULL);
-  g_object_unref (dialog);
+  name = g_action_get_name (G_ACTION (action));
+
+  dialog = gtk_message_dialog_new (NULL,
+                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_CLOSE,
+                                   "You activated action: \"%s\"",
+                                    name);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gtk_window_destroy), NULL);
+
+  gtk_widget_show (dialog);
 }

 static void
@@ -57,7 +67,7 @@ show_action_infobar (GSimpleAction *action,
  text = g_strdup_printf ("You activated radio action: \"%s\".\n"
                          "Current value: %s", name, value);
  gtk_label_set_text (GTK_LABEL (window->message), text);
-  gtk_widget_set_visible (window->infobar, TRUE);
+  gtk_widget_show (window->infobar);
  g_free (text);
 }

@@ -80,38 +90,43 @@ activate_new (GSimpleAction *action,
 }

 static void
-open_response_cb (GObject *source,
-                  GAsyncResult *result,
-                  gpointer user_data)
+open_response_cb (GtkNativeDialog *dialog,
+                  int              response_id,
+                  gpointer         user_data)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GApplication *app = G_APPLICATION (user_data);
+  GtkFileChooserNative *native = user_data;
+  GApplication *app = g_object_get_data (G_OBJECT (native), "app");
+  GtkWidget *message_dialog;
  GFile *file;
+  char *contents;
  GError *error = NULL;

-  file = gtk_file_dialog_open_finish (dialog, result, &error);
-  if (file)
+  if (response_id == GTK_RESPONSE_ACCEPT)
    {
-      char *contents;
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (native));

      if (g_file_load_contents (file, NULL, &contents, NULL, NULL, &error))
        {
          create_window (app, contents);
          g_free (contents);
        }
+      else
+        {
+          message_dialog = gtk_message_dialog_new (NULL,
+                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "Error loading file: \"%s\"",
+                                                   error->message);
+          g_signal_connect (message_dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), NULL);
+          gtk_widget_show (message_dialog);
+          g_error_free (error);
+        }
    }

-  if (error)
-    {
-      GtkAlertDialog *alert;
-
-      alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_error_free (error);
-    }
-
-  g_object_unref (app);
+  gtk_native_dialog_destroy (GTK_NATIVE_DIALOG (native));
+  g_object_unref (native);
 }


@@ -121,11 +136,21 @@ activate_open (GSimpleAction *action,
               gpointer       user_data)
 {
  GApplication *app = user_data;
-  GtkFileDialog *dialog;
+  GtkFileChooserNative *native;

-  dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, NULL, open_response_cb, g_object_ref (app));
-  g_object_unref (dialog);
+  native = gtk_file_chooser_native_new ("Open File",
+                                        NULL,
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+                                        "_Open",
+                                        "_Cancel");
+
+  g_object_set_data_full (G_OBJECT (native), "app", g_object_ref (app), g_object_unref);
+  g_signal_connect (native,
+                    "response",
+                    G_CALLBACK (open_response_cb),
+                    native);
+
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (native));
 }

 static void
@@ -295,7 +320,7 @@ static GActionEntry win_entries[] = {
 static void
 clicked_cb (GtkWidget *widget, DemoApplicationWindow *window)
 {
-  gtk_widget_set_visible (window->infobar, FALSE);
+  gtk_widget_hide (window->infobar);
 }

 static void
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -140,6 +140,7 @@ create_page3 (GtkWidget *assistant)

  label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");

+  gtk_widget_show (label);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
@@ -156,6 +157,7 @@ create_page4 (GtkWidget *assistant)
  gtk_widget_set_margin_start (progress_bar, 40);
  gtk_widget_set_margin_end (progress_bar, 40);

+  gtk_widget_show (progress_bar);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
@@ -197,7 +199,7 @@ do_assistant (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (assistant))
-    gtk_widget_set_visible (assistant, TRUE);
+    gtk_widget_show (assistant);
  else
    gtk_window_destroy (GTK_WINDOW (assistant));

--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -168,7 +168,7 @@ do_builder (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,5 +1,4 @@
 /* Clipboard
- * #Keywords: drag-and-drop, dnd
 *
 * GdkClipboard is used for clipboard handling. This demo shows how to
 * copy and paste text, images, colors or files to and from the clipboard.
@@ -51,10 +50,10 @@ copy_button_clicked (GtkStack *source_stack,
    }
  else if (strcmp (visible_child_name, "Color") == 0)
    {
-      const GdkRGBA *color;
+      GdkRGBA color;

-      color = gtk_color_dialog_button_get_rgba (GTK_COLOR_DIALOG_BUTTON (visible_child));
-      gdk_clipboard_set (clipboard, GDK_TYPE_RGBA, color);
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (visible_child), &color);
+      gdk_clipboard_set (clipboard, GDK_TYPE_RGBA, &color);
    }
  else if (strcmp (visible_child_name, "File") == 0)
    {
@@ -216,70 +215,39 @@ file_button_set_file (GtkButton *button,
 }

 static void
-file_chooser_response (GObject *source,
-                       GAsyncResult *result,
-                       gpointer user_data)
+file_chooser_response (GtkNativeDialog *dialog,
+                       int              response,
+                       GtkButton       *button)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GtkButton *button = GTK_BUTTON (user_data);
-  GFile *file;
+  gtk_native_dialog_hide (dialog);

-  file = gtk_file_dialog_open_finish (dialog, result, NULL);
-  if (file)
+  if (response == GTK_RESPONSE_ACCEPT)
    {
+      GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      file_button_set_file (button, file);
      g_object_unref (file);

      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
    }
+
+  gtk_native_dialog_destroy (dialog);
 }

 static void
 open_file_cb (GtkWidget *button)
 {
-  GtkFileDialog *dialog;
+  GtkFileChooserNative *chooser;

-  dialog = gtk_file_dialog_new ();
+  chooser = gtk_file_chooser_native_new ("Choose a file",
+                                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
+                                         GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         "_Open",
+                                         "_Cancel");

-  gtk_file_dialog_open (dialog,
-                        GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                        NULL,
-                        NULL,
-                        file_chooser_response, button);
+  g_signal_connect (chooser, "response", G_CALLBACK (file_chooser_response), button);
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (chooser));
 }

-static void
-folder_chooser_response (GObject *source,
-                         GAsyncResult *result,
-                         gpointer user_data)
-{
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GtkButton *button = GTK_BUTTON (user_data);
-  GFile *file;
-
-  file = gtk_file_dialog_select_folder_finish (dialog, result, NULL);
-  if (file)
-    {
-      file_button_set_file (button, file);
-      g_object_unref (file);
-
-      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
-    }
-}
-
-static void
-open_folder_cb (GtkWidget *button)
-{
-  GtkFileDialog *dialog;
-
-  dialog = gtk_file_dialog_new ();
-
-  gtk_file_dialog_select_folder (dialog,
-                                 GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                                 NULL,
-                                 NULL,
-                                 folder_chooser_response, button);
-}
 static void
 update_paste_button_sensitivity (GdkClipboard *clipboard,
                                 GtkWidget    *paste_button)
@@ -378,7 +346,6 @@ do_clipboard (GtkWidget *do_widget)
      gtk_builder_cscope_add_callback (scope, source_changed_cb);
      gtk_builder_cscope_add_callback (scope, text_changed_cb);
      gtk_builder_cscope_add_callback (scope, open_file_cb);
-      gtk_builder_cscope_add_callback (scope, open_folder_cb);
      gtk_builder_cscope_add_callback (scope, on_drop);
      gtk_builder_cscope_add_callback (scope, drag_prepare);
      builder = gtk_builder_new ();
@@ -402,7 +369,7 @@ do_clipboard (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/clipboard.ui
+++ b/demos/gtk-demo/clipboard.ui
@@ -32,7 +32,6 @@
                      <item>Color</item>
                      <item>Image</item>
                      <item>File</item>
-                      <item>Folder</item>
                    </items>
                  </object>
                </property>
@@ -65,11 +64,7 @@
                  <object class="GtkStackPage">
                    <property name="name">Color</property>
                    <property name="child">
-                      <object class="GtkColorDialogButton" id="source_color">
-                        <property name="dialog">
-                          <object class="GtkColorDialog">
-                          </object>
-                        </property>
+                      <object class="GtkColorButton" id="source_color">
                        <property name="valign">center</property>
                        <property name="rgba">purple</property>
                      </object>
@@ -167,30 +162,6 @@
                    </property>
                  </object>
                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Folder</property>
-                    <property name="child">
-                      <object class="GtkButton" id="source_folder">
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="propagation-phase">capture</property>
-                            <signal name="prepare" handler="drag_prepare"/>
-                          </object>
-                        </child>
-                        <property name="valign">center</property>
-                        <property name="child">
-                          <object class="GtkLabel">
-                            <property name="label">—</property>
-                            <property name="xalign">0</property>
-                            <property name="ellipsize">start</property>
-                          </object>
-                        </property>
-                        <signal name="clicked" handler="open_folder_cb"/>
-                      </object>
-                    </property>
-                  </object>
-                </child>
              </object>
            </child>
            <child>
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -449,7 +449,7 @@ do_combobox (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -277,7 +277,7 @@ do_constraints (GtkWidget *do_widget)
   }

 if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
 else
   gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/constraints_builder.c
+++ b/demos/gtk-demo/constraints_builder.c
@@ -66,7 +66,7 @@ do_constraints_builder (GtkWidget *do_widget)
   }

 if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
 else
   gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/constraints_interactive.c
+++ b/demos/gtk-demo/constraints_interactive.c
@@ -229,7 +229,7 @@ do_constraints_interactive (GtkWidget *do_widget)
   }

 if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
 else
   gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/constraints_vfl.c
+++ b/demos/gtk-demo/constraints_vfl.c
@@ -152,7 +152,7 @@ do_constraints_vfl (GtkWidget *do_widget)
   }

 if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
 else
   gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_accordion.c
+++ b/demos/gtk-demo/css_accordion.c
@@ -68,7 +68,7 @@ do_css_accordion (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -115,7 +115,7 @@ do_css_basics (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -139,7 +139,7 @@ do_css_blendmodes (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -155,7 +155,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -124,7 +124,7 @@ do_css_pixbufs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -142,7 +142,7 @@ do_css_shadows (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -33,7 +33,7 @@ do_cursors (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -8,8 +8,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *window = NULL;
 static GtkWidget *entry1 = NULL;
 static GtkWidget *entry2 = NULL;
@@ -29,7 +27,7 @@ message_dialog_clicked (GtkButton *button,
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            ngettext ("Has been shown once", "Has been shown %d times", i), i);
  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
-  gtk_window_present (GTK_WINDOW (dialog));
+  gtk_widget_show (dialog);
  i++;
 }

@@ -116,7 +114,7 @@ interactive_dialog_clicked (GtkButton *button,
                         data, (GClosureNotify) g_free,
                         0);

-  gtk_window_present (GTK_WINDOW (dialog));
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -186,7 +184,7 @@ do_dialog (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -11,6 +11,7 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS

 G_DECLARE_FINAL_TYPE (CanvasItem, canvas_item, CANVAS, ITEM, GtkWidget)

@@ -25,9 +26,6 @@ struct _CanvasItem {
  double delta;

  GtkWidget *editor;
-
-  GtkStyleProvider *provider;
-  char *css_class;
 };

 struct _CanvasItemClass {
@@ -38,41 +36,32 @@ G_DEFINE_TYPE (CanvasItem, canvas_item, GTK_TYPE_WIDGET)

 static int n_items = 0;

-static void
-unstyle_item (CanvasItem *item)
-{
-  if (item->provider)
-    {
-      gtk_style_context_remove_provider_for_display (gtk_widget_get_display (item->label), item->provider);
-      g_clear_object (&item->provider);
-    }
-
-  if (item->css_class)
-    {
-      gtk_widget_remove_css_class (item->label, item->css_class);
-      g_clear_pointer (&item->css_class, g_free);
-    }
-}
-
 static void
 set_color (CanvasItem *item,
           GdkRGBA    *color)
 {
  char *css;
  char *str;
+  GtkStyleContext *context;
  GtkCssProvider *provider;
-  const char *name;
-
-  unstyle_item (item);
+  const char *old_class;

  str = gdk_rgba_to_string (color);
-  name = gtk_widget_get_name (item->label);
-  css = g_strdup_printf ("#%s { background: %s; }", name, str);
+  css = g_strdup_printf ("* { background: %s; }", str);
+
+  context = gtk_widget_get_style_context (item->label);
+  provider = g_object_get_data (G_OBJECT (context), "style-provider");
+  if (provider)
+    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
+
+  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
+  if (old_class)
+    gtk_widget_remove_css_class (item->label, old_class);

  provider = gtk_css_provider_new ();
  gtk_css_provider_load_from_data (provider, css, -1);
-  gtk_style_context_add_provider_for_display (gtk_widget_get_display (item->label), GTK_STYLE_PROVIDER (provider), 700);
-  item->provider = GTK_STYLE_PROVIDER (provider);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (item->label), GTK_STYLE_PROVIDER (provider), 800);
+  g_object_set_data_full (G_OBJECT (context), "style-provider", provider, g_object_unref);

  g_free (str);
  g_free (css);
@@ -82,10 +71,21 @@ static void
 set_css (CanvasItem *item,
         const char *class)
 {
-  unstyle_item (item);
+  GtkStyleContext *context;
+  GtkCssProvider *provider;
+  const char *old_class;

+  context = gtk_widget_get_style_context (item->label);
+  provider = g_object_get_data (G_OBJECT (context), "style-provider");
+  if (provider)
+    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
+
+  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
+  if (old_class)
+    gtk_widget_remove_css_class (item->label, old_class);
+
+  g_object_set_data_full (G_OBJECT (item->label), "css-class", g_strdup (class), g_free);
  gtk_widget_add_css_class (item->label, class);
-  item->css_class = g_strdup (class);
 }

 static gboolean
@@ -724,11 +724,8 @@ do_dnd (GtkWidget *do_widget)
      int i;
      int x, y;
      GtkCssProvider *provider;
-      GString *css;

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
      button = gtk_color_button_new ();
-G_GNUC_END_IGNORE_DEPRECATIONS
      g_object_unref (g_object_ref_sink (button));

      provider = gtk_css_provider_new ();
@@ -738,18 +735,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
                                                  800);
      g_object_unref (provider);

-      css = g_string_new ("");
-      for (i = 0; colors[i]; i++)
-        g_string_append_printf (css, ".canvasitem.%s { background: %s; }\n", colors[i], colors[i]);
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css->str, css->len);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-      g_object_unref (provider);
-      g_string_free (css, TRUE);
-
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
@@ -802,7 +787,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -372,7 +372,7 @@ do_drawingarea (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
  else
      gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/dropdown.c
+++ b/demos/gtk-demo/dropdown.c
@@ -164,14 +164,14 @@ strings_bind_item (GtkSignalListItemFactory *factory,
  popup = gtk_widget_get_ancestor (title, GTK_TYPE_POPOVER);
  if (popup && gtk_widget_is_ancestor (popup, GTK_WIDGET (dropdown)))
    {
-      gtk_widget_set_visible (checkmark, TRUE);
+      gtk_widget_show (checkmark);
      g_signal_connect (dropdown, "notify::selected-item",
                        G_CALLBACK (selected_item_changed), item);
      selected_item_changed (dropdown, NULL, item);
    }
  else
    {
-      gtk_widget_set_visible (checkmark, FALSE);
+      gtk_widget_hide (checkmark);
    }
 }

@@ -563,7 +563,7 @@ do_dropdown (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -409,7 +409,7 @@ do_editable_cells (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -115,7 +115,7 @@ do_entry_completion (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -46,7 +46,7 @@ do_entry_undo (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/errorstates.c
+++ b/demos/gtk-demo/errorstates.c
@@ -42,12 +42,12 @@ mode_switch_state_set (GtkSwitch *sw,
  if (!state ||
      (gtk_range_get_value (GTK_RANGE (scale)) > 50))
    {
-      gtk_widget_set_visible (label, FALSE);
+      gtk_widget_hide (label);
      gtk_switch_set_state (sw, state);
    }
  else
    {
-      gtk_widget_set_visible (label, TRUE);
+      gtk_widget_show (label);
    }

  return TRUE;
@@ -65,7 +65,7 @@ level_scale_value_changed (GtkRange *range,
      !gtk_switch_get_state (GTK_SWITCH (sw)) &&
      (gtk_range_get_value (range) > 50))
    {
-      gtk_widget_set_visible (label, FALSE);
+      gtk_widget_hide (label);
      gtk_switch_set_state (GTK_SWITCH (sw), TRUE);
    }
  else if (gtk_switch_get_state (GTK_SWITCH (sw)) &&
@@ -113,7 +113,7 @@ do_errorstates (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -10,8 +10,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *window = NULL;

 static void
@@ -122,7 +120,7 @@ do_expander (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/filtermodel.c
+++ b/demos/gtk-demo/filtermodel.c
@@ -199,7 +199,7 @@ do_filtermodel (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -68,13 +68,11 @@ create_blurred_button (void)
  return w;
 }

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
  return gtk_font_button_new ();
 }
-G_GNUC_END_IGNORE_DEPRECATIONS

 static GtkWidget *
 create_level_bar (void)
@@ -329,7 +327,7 @@ do_fishbowl (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -160,7 +160,7 @@ do_fixed (GtkWidget *do_widget)
    demo_window = create_demo_window (do_widget);

  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
  else
    gtk_window_destroy (GTK_WINDOW (demo_window));

--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -742,7 +742,7 @@ do_flowbox (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -23,76 +23,6 @@

 G_GNUC_BEGIN_IGNORE_DEPRECATIONS

-/* {{{ ScriptLang object */
-
-G_DECLARE_FINAL_TYPE (ScriptLang, script_lang, SCRIPT, LANG, GObject)
-
-struct _ScriptLang
-{
-  GObject parent;
-
-  char *langname;
-  unsigned int script_index;
-  unsigned int lang_index;
-  hb_tag_t lang_tag;
-};
-
-struct _ScriptLangClass
-{
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (ScriptLang, script_lang, G_TYPE_OBJECT)
-
-static void
-script_lang_init (ScriptLang *self)
-{
-}
-
-static void
-script_lang_finalize (GObject *object)
-{
-  ScriptLang *self = SCRIPT_LANG (object);
-
-  g_free (self->langname);
-
-  G_OBJECT_CLASS (script_lang_parent_class)->finalize (object);
-}
-
-static void
-script_lang_class_init (ScriptLangClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = script_lang_finalize;
-}
-
-static ScriptLang *
-script_lang_new (const char   *langname,
-                 unsigned int  script_index,
-                 unsigned int  lang_index,
-                 hb_tag_t      lang_tag)
-{
-  ScriptLang *self;
-
-  self = g_object_new (script_lang_get_type (), NULL);
-
-  self->langname = g_strdup (langname);
-  self->script_index = script_index;
-  self->lang_index = lang_index;
-  self->lang_tag = lang_tag;
-
-  return self;
-}
-
-static char *
-script_lang_get_langname (ScriptLang *self)
-{
-  return g_strdup (self->langname);
-}
-
-/* }}} */
-
 #define MAKE_TAG(a,b,c,d) (unsigned int)(((a) << 24) | ((b) << 16) | ((c) <<  8) | (d))

 typedef struct {
@@ -165,10 +95,6 @@ demo_free (gpointer data)
  g_clear_pointer (&demo->axes, g_hash_table_unref);
  g_clear_pointer (&demo->text, g_free);

-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (),
-                                                 GTK_STYLE_PROVIDER (demo->provider));
-  g_object_unref (demo->provider);
-
  g_free (demo);
 }

@@ -258,10 +184,10 @@ swap_colors (void)
  GdkRGBA fg;
  GdkRGBA bg;

-  fg = *gtk_color_dialog_button_get_rgba (GTK_COLOR_DIALOG_BUTTON (demo->foreground));
-  bg = *gtk_color_dialog_button_get_rgba (GTK_COLOR_DIALOG_BUTTON (demo->background));
-  gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (demo->foreground), &bg);
-  gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (demo->background), &fg);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (demo->foreground), &fg);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (demo->background), &bg);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->foreground), &bg);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->background), &fg);
 }

 static void
@@ -270,8 +196,8 @@ font_features_reset_basic (void)
  gtk_adjustment_set_value (demo->size_adjustment, 20);
  gtk_adjustment_set_value (demo->letterspacing_adjustment, 0);
  gtk_adjustment_set_value (demo->line_height_adjustment, 1);
-  gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (demo->foreground), &(GdkRGBA){0.,0.,0.,1.});
-  gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (demo->background), &(GdkRGBA){1.,1.,1.,1.});
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->foreground), &(GdkRGBA){0.,0.,0.,1.});
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->background), &(GdkRGBA){1.,1.,1.,1.});
 }

 static void
@@ -279,7 +205,7 @@ update_basic (void)
 {
  PangoFontDescription *desc;

-  desc = gtk_font_dialog_button_get_font_desc (GTK_FONT_DIALOG_BUTTON (demo->font));
+  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (demo->font));

  gtk_adjustment_set_value (demo->size_adjustment,
                            pango_font_description_get_size (desc) / (double) PANGO_SCALE);
@@ -546,6 +472,8 @@ update_display (void)
  GString *s;
  char *text;
  gboolean has_feature;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
  PangoFontDescription *desc;
  GList *l;
  PangoAttrList *attrs;
@@ -590,7 +518,7 @@ update_display (void)
      end = PANGO_ATTR_INDEX_TO_TEXT_END;
    }

-  desc = gtk_font_dialog_button_get_font_desc (GTK_FONT_DIALOG_BUTTON (demo->font));
+  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (demo->font));

  value = gtk_adjustment_get_value (demo->size_adjustment);
  pango_font_description_set_size (desc, value * PANGO_SCALE);
@@ -648,13 +576,14 @@ update_display (void)

  features = g_string_free (s, FALSE);

-  if (gtk_drop_down_get_selected (GTK_DROP_DOWN (demo->script_lang)) != 0)
+  if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (demo->script_lang), &iter))
    {
-      ScriptLang *selected;
+      hb_tag_t lang_tag;

-      selected = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (demo->script_lang));
+      model = gtk_combo_box_get_model (GTK_COMBO_BOX (demo->script_lang));
+      gtk_tree_model_get (model, &iter, 3, &lang_tag, -1);

-      lang = pango_language_from_string (hb_language_to_string (hb_ot_tag_to_language (selected->lang_tag)));
+      lang = pango_language_from_string (hb_language_to_string (hb_ot_tag_to_language (lang_tag)));
    }
  else
    lang = NULL;
@@ -681,7 +610,7 @@ update_display (void)
      GdkRGBA rgba;
      char *fg, *bg, *css;

-      rgba = *gtk_color_dialog_button_get_rgba (GTK_COLOR_DIALOG_BUTTON (demo->foreground));
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (demo->foreground), &rgba);
      attr = pango_attr_foreground_new (65535 * rgba.red,
                                        65535 * rgba.green,
                                        65535 * rgba.blue);
@@ -694,7 +623,7 @@ update_display (void)
      pango_attr_list_insert (attrs, attr);

      fg = gdk_rgba_to_string (&rgba);
-      rgba = *gtk_color_dialog_button_get_rgba (GTK_COLOR_DIALOG_BUTTON (demo->background));
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (demo->background), &rgba);
      bg = gdk_rgba_to_string (&rgba);
      css = g_strdup_printf (".font_features_background { caret-color: %s; background-color: %s; }", fg, bg);
      gtk_css_provider_load_from_data (demo->provider, css, strlen (css));
@@ -769,6 +698,7 @@ update_display (void)
  gtk_label_set_attributes (GTK_LABEL (demo->the_label), attrs);

  g_free (font_desc);
+  pango_font_description_free (desc);
  g_free (features);
  pango_attr_list_unref (attrs);
  g_free (text);
@@ -780,7 +710,7 @@ get_pango_font (void)
  PangoFontDescription *desc;
  PangoContext *context;

-  desc = gtk_font_dialog_button_get_font_desc (GTK_FONT_DIALOG_BUTTON (demo->font));
+  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (demo->font));
  context = gtk_widget_get_pango_context (demo->font);

  return pango_context_load_font (context, desc);
@@ -810,40 +740,50 @@ tag_pair_equal (gconstpointer a, gconstpointer b)
  return pair_a->script_tag == pair_b->script_tag && pair_a->lang_tag == pair_b->lang_tag;
 }

-
-static GtkOrdering
-script_sort (const void *item1,
-             const void *item2,
-             void       *data)
+static int
+script_sort_func (GtkTreeModel *model,
+                  GtkTreeIter  *a,
+                  GtkTreeIter  *b,
+                  gpointer      user_data)
 {
-  ScriptLang *a = (ScriptLang *)item1;
-  ScriptLang *b = (ScriptLang *)item2;
+  char *sa, *sb;
+  int ret;

-  return strcmp (a->langname, b->langname);
+  gtk_tree_model_get (model, a, 0, &sa, -1);
+  gtk_tree_model_get (model, b, 0, &sb, -1);
+
+  ret = strcmp (sa, sb);
+
+  g_free (sa);
+  g_free (sb);
+
+  return ret;
 }

 static void
 update_script_combo (void)
 {
-  GListStore *store;
-  GtkSortListModel *sortmodel;
+  GtkListStore *store;
  hb_font_t *hb_font;
+  int i, j, k;
  PangoFont *pango_font;
  GHashTable *tags;
  GHashTableIter iter;
  TagPair *pair;
-  PangoLanguage *language;
-  const char *lang;
+  char *lang;
  hb_tag_t active;
+  GtkTreeIter active_iter;
+  gboolean have_active = FALSE;

-  language = gtk_font_dialog_button_get_language (GTK_FONT_DIALOG_BUTTON (demo->font));
-  lang = pango_language_to_string (language);
+  lang = gtk_font_chooser_get_language (GTK_FONT_CHOOSER (demo->font));

  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  active = hb_ot_tag_from_language (hb_language_from_string (lang, -1));
  G_GNUC_END_IGNORE_DEPRECATIONS

-  store = g_list_store_new (script_lang_get_type ());
+  g_free (lang);
+
+  store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);

  pango_font = get_pango_font ();
  hb_font = pango_font_get_hb_font (pango_font);
@@ -855,6 +795,11 @@ update_script_combo (void)
  pair->lang_tag = 0;
  g_hash_table_add (tags, pair);

+  pair = g_new (TagPair, 1);
+  pair->script_tag = HB_OT_TAG_DEFAULT_SCRIPT;
+  pair->lang_tag = HB_OT_TAG_DEFAULT_LANGUAGE;
+  g_hash_table_add (tags, pair);
+
  if (hb_font)
    {
      hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
@@ -862,19 +807,19 @@ update_script_combo (void)

      hb_face = hb_font_get_face (hb_font);

-      for (guint i = 0; i < 2; i++)
+      for (i= 0; i < 2; i++)
        {
          hb_tag_t scripts[80];
          unsigned int script_count = G_N_ELEMENTS (scripts);

          hb_ot_layout_table_get_script_tags (hb_face, tables[i], 0, &script_count, scripts);
-          for (guint j = 0; j < script_count; j++)
+          for (j = 0; j < script_count; j++)
            {
              hb_tag_t languages[80];
              unsigned int language_count = G_N_ELEMENTS (languages);

              hb_ot_layout_script_get_language_tags (hb_face, tables[i], j, 0, &language_count, languages);
-              for (guint k = 0; k < language_count; k++)
+              for (k = 0; k < language_count; k++)
                {
                  pair = g_new (TagPair, 1);
                  pair->script_tag = scripts[j];
@@ -894,6 +839,7 @@ update_script_combo (void)
    {
      const char *langname;
      char langbuf[5];
+      GtkTreeIter tree_iter;

      if (pair->lang_tag == 0 && pair->script_tag == 0)
        langname = NC_("Language", "None");
@@ -910,31 +856,31 @@ update_script_combo (void)
            }
        }

-      g_list_store_append (store, script_lang_new (langname,
-                                                   pair->script_index,
-                                                   pair->lang_index,
-                                                   pair->lang_tag));
+      gtk_list_store_insert_with_values (store, &tree_iter, -1,
+                                         0, langname,
+                                         1, pair->script_index,
+                                         2, pair->lang_index,
+                                         3, pair->lang_tag,
+                                         -1);
+      if (pair->lang_tag == active)
+        {
+          have_active = TRUE;
+          active_iter = tree_iter;
+        }
    }

  g_hash_table_destroy (tags);

-  sortmodel = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                       GTK_SORTER (gtk_custom_sorter_new (script_sort, NULL, NULL)));
-  gtk_drop_down_set_model (GTK_DROP_DOWN (demo->script_lang), G_LIST_MODEL (sortmodel));
-
-  for (guint i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (sortmodel)); i++)
-    {
-      ScriptLang *item = g_list_model_get_item (G_LIST_MODEL (sortmodel), i);
-      g_object_unref (item);
-
-      if (item->lang_tag == active)
-        {
-          gtk_drop_down_set_selected (GTK_DROP_DOWN (demo->script_lang), i);
-          break;
-        }
-    }
-
-  g_object_unref (sortmodel);
+  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
+                                           script_sort_func, NULL, NULL);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                                        GTK_SORT_ASCENDING);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (demo->script_lang), GTK_TREE_MODEL (store));
+  if (have_active)
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (demo->script_lang), &active_iter);
+  else
+    gtk_combo_box_set_active_iter (GTK_COMBO_BOX (demo->script_lang), 0);
 }

 static char *
@@ -959,22 +905,33 @@ static void
 update_features (void)
 {
  int i, j;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+  guint script_index, lang_index;
+  hb_tag_t lang_tag;
  PangoFont *pango_font;
  hb_font_t *hb_font;
  GList *l;
-  ScriptLang *selected;

  /* set feature presence checks from the font features */

-  selected = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (demo->script_lang));
+  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (demo->script_lang), &iter))
+    return;

-  if (selected->lang_tag == 0) /* None is selected */
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (demo->script_lang));
+  gtk_tree_model_get (model, &iter,
+                      1, &script_index,
+                      2, &lang_index,
+                      3, &lang_tag,
+                      -1);
+
+  if (lang_tag == 0) /* None is selected */
    {
      for (l = demo->feature_items; l; l = l->next)
        {
          FeatureItem *item = l->data;
-          gtk_widget_set_visible (item->feat, TRUE);
-          gtk_widget_set_visible (gtk_widget_get_parent (item->feat), TRUE);
+          gtk_widget_show (item->feat);
+          gtk_widget_show (gtk_widget_get_parent (item->feat));
          if (strcmp (item->name, "xxxx") == 0)
            gtk_check_button_set_active (GTK_CHECK_BUTTON (item->feat), TRUE);
        }
@@ -985,8 +942,8 @@ update_features (void)
  for (l = demo->feature_items; l; l = l->next)
    {
      FeatureItem *item = l->data;
-      gtk_widget_set_visible (item->feat, FALSE);
-      gtk_widget_set_visible (gtk_widget_get_parent (item->feat), FALSE);
+      gtk_widget_hide (item->feat);
+      gtk_widget_hide (gtk_widget_get_parent (item->feat));
      if (strcmp (item->name, "xxxx") == 0)
        gtk_check_button_set_active (GTK_CHECK_BUTTON (item->feat), TRUE);
    }
@@ -994,13 +951,11 @@ update_features (void)
  pango_font = get_pango_font ();
  hb_font = pango_font_get_hb_font (pango_font);

-  g_print ("language %s\n", selected->langname);
-
  if (hb_font)
    {
      hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
      hb_face_t *hb_face;
-      const char *feat;
+      char *feat;

      hb_face = hb_font_get_face (hb_font);

@@ -1011,8 +966,8 @@ update_features (void)

          hb_ot_layout_language_get_feature_tags (hb_face,
                                                  tables[i],
-                                                  selected->script_index,
-                                                  selected->lang_index,
+                                                  script_index,
+                                                  lang_index,
                                                  0,
                                                  &count,
                                                  features);
@@ -1022,6 +977,9 @@ update_features (void)
              char buf[5];
              hb_tag_to_string (features[j], buf);
              buf[4] = 0;
+#if 0
+              g_print ("%s present in %s\n", buf, i == 0 ? "GSUB" : "GPOS");
+#endif

              if (g_str_has_prefix (buf, "ss") || g_str_has_prefix (buf, "cv"))
                {
@@ -1031,8 +989,8 @@ update_features (void)

                  hb_ot_layout_language_find_feature (hb_face,
                                                      tables[i],
-                                                      selected->script_index,
-                                                      selected->lang_index,
+                                                      script_index,
+                                                      lang_index,
                                                      features[j],
                                                      &feature_index);

@@ -1071,15 +1029,15 @@ update_features (void)

                  if (item->tag == features[j])
                    {
-                      gtk_widget_set_visible (item->feat, TRUE);
-                      gtk_widget_set_visible (gtk_widget_get_parent (item->feat), TRUE);
+                      gtk_widget_show (item->feat);
+                      gtk_widget_show (gtk_widget_get_parent (item->feat));
                      if (GTK_IS_CHECK_BUTTON (item->feat))
                        {
                          GtkWidget *def = GTK_WIDGET (g_object_get_data (G_OBJECT (item->feat), "default"));
                          if (def)
                            {
-                              gtk_widget_set_visible (def, TRUE);
-                              gtk_widget_set_visible (gtk_widget_get_parent (def), TRUE);
+                              gtk_widget_show (def);
+                              gtk_widget_show (gtk_widget_get_parent (def));
                              gtk_check_button_set_active (GTK_CHECK_BUTTON (def), TRUE);
                            }
                          else
@@ -1090,7 +1048,7 @@ update_features (void)
            }
        }

-      feat = gtk_font_dialog_button_get_font_features (GTK_FONT_DIALOG_BUTTON (demo->font));
+      feat = gtk_font_chooser_get_font_features (GTK_FONT_CHOOSER (demo->font));
      if (feat)
        {
          for (l = demo->feature_items; l; l = l->next)
@@ -1116,6 +1074,8 @@ update_features (void)
                    }
                }
            }
+
+          g_free (feat);
        }
    }

@@ -1362,9 +1322,10 @@ free_instance (gpointer data)
 }

 static void
-add_instance (hb_face_t     *face,
-              unsigned int   index,
-              GtkStringList *strings)
+add_instance (hb_face_t    *face,
+              unsigned int  index,
+              GtkWidget    *combo,
+              int           pos)
 {
  Instance *instance;
  hb_ot_name_id_t name_id;
@@ -1380,20 +1341,20 @@ add_instance (hb_face_t     *face,
  instance->index = index;

  g_hash_table_add (demo->instances, instance);
-  gtk_string_list_append (GTK_STRING_LIST (strings), instance->name);
+  gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), instance->name);
 }

 static void
 unset_instance (GtkAdjustment *adjustment)
 {
  if (demo->instance_combo)
-    gtk_drop_down_set_selected (GTK_DROP_DOWN (demo->instance_combo), 0);
+    gtk_combo_box_set_active (GTK_COMBO_BOX (demo->instance_combo), 0);
 }

 static void
-instance_changed (GtkDropDown *combo)
+instance_changed (GtkComboBox *combo)
 {
-  const char *text;
+  char *text;
  Instance *instance;
  Instance ikey;
  int i;
@@ -1405,15 +1366,17 @@ instance_changed (GtkDropDown *combo)
  hb_font_t *hb_font;
  hb_face_t *hb_face;

-  text = gtk_string_list_get_string (GTK_STRING_LIST (gtk_drop_down_get_model (combo)),
-                                     gtk_drop_down_get_selected (combo));
+  text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo));
  if (text[0] == '\0')
    goto out;

-  ikey.name = (char *) text;
+  ikey.name = text;
  instance = g_hash_table_lookup (demo->instances, &ikey);
  if (!instance)
-    goto out;
+    {
+      g_print ("did not find instance %s\n", text);
+      goto out;
+    }

  pango_font = get_pango_font ();
  hb_font = pango_font_get_hb_font (pango_font);
@@ -1448,6 +1411,7 @@ instance_changed (GtkDropDown *combo)
    }

 out:
+  g_free (text);
  g_clear_object (&pango_font);
  g_free (ai);
  g_free (coords);
@@ -1557,7 +1521,6 @@ update_font_variations (void)
    {
      GtkWidget *label;
      GtkWidget *combo;
-      GtkStringList *strings;

      label = gtk_label_new ("Instance");
      gtk_label_set_xalign (GTK_LABEL (label), 0);
@@ -1565,28 +1528,26 @@ update_font_variations (void)
      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
      gtk_grid_attach (GTK_GRID (demo->variations_grid), label, 0, -1, 1, 1);

-      strings = gtk_string_list_new (NULL);
-      combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-
+      combo = gtk_combo_box_text_new ();
      gtk_widget_set_halign (combo, GTK_ALIGN_START);
      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);

-      gtk_string_list_append (strings, "");
+      gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "");

      for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++)
-        add_instance (hb_face, i, strings);
+        add_instance (hb_face, i, combo, i);

      for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++)
        {
          if (matches_instance (hb_face, i, n_axes, design_coords))
            {
-              gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i + 1);
+              gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i + 1);
              break;
            }
        }

      gtk_grid_attach (GTK_GRID (demo->variations_grid), combo, 1, -1, 3, 1);
-      g_signal_connect (combo, "notify::selecte", G_CALLBACK (instance_changed), NULL);
+      g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL);
      demo->instance_combo = combo;
   }

@@ -1733,7 +1694,6 @@ do_font_features (GtkWidget *do_widget)
      GtkBuilder *builder;
      GtkBuilderScope *scope;
      GtkEventController *controller;
-      GtkExpression *expression;

      builder = gtk_builder_new ();

@@ -1767,10 +1727,6 @@ do_font_features (GtkWidget *do_widget)
      demo->description = GTK_WIDGET (gtk_builder_get_object (builder, "description"));
      demo->font = GTK_WIDGET (gtk_builder_get_object (builder, "font"));
      demo->script_lang = GTK_WIDGET (gtk_builder_get_object (builder, "script_lang"));
-      g_assert (GTK_IS_DROP_DOWN (demo->script_lang));
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL, 0, NULL, G_CALLBACK (script_lang_get_langname), NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (demo->script_lang), expression);
-      gtk_expression_unref (expression);
      demo->feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
      demo->stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack"));
      demo->entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
@@ -1789,8 +1745,8 @@ do_font_features (GtkWidget *do_widget)
      demo->swin = GTK_WIDGET (gtk_builder_get_object (builder, "swin"));

      demo->provider = gtk_css_provider_new ();
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (demo->provider), 800);
+      gtk_style_context_add_provider (gtk_widget_get_style_context (demo->swin),
+                                      GTK_STYLE_PROVIDER (demo->provider), 800);

      basic_value_changed (demo->size_adjustment, demo->size_entry);
      basic_value_changed (demo->letterspacing_adjustment, demo->letterspacing_entry);
@@ -1868,5 +1824,3 @@ do_font_features (GtkWidget *do_widget)

  return window;
 }
-
-/* vim:set foldmethod=marker expandtab: */
--- a/demos/gtk-demo/font_features.ui
+++ b/demos/gtk-demo/font_features.ui
@@ -58,14 +58,11 @@
                    <property name="orientation">vertical</property>
                    <property name="spacing">6</property>
                    <child>
-                      <object class="GtkFontDialogButton" id="font">
-                        <property name="dialog">
-                          <object class="GtkFontDialog">
-                          </object>
-                        </property>
+                      <object class="GtkFontButton" id="font">
                        <property name="receives-default">1</property>
-                        <property name="level">face</property>
-                        <signal name="notify::font-desc" handler="font_features_font_changed" swapped="no"/>
+                        <property name="font">Sans 12</property>
+                        <property name="level">family|style</property>
+                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
                      </object>
                    </child>
                    <child>
@@ -195,11 +192,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkColorDialogButton" id="foreground">
-                            <property name="dialog">
-                              <object class="GtkColorDialog">
-                              </object>
-                            </property>
+                          <object class="GtkColorButton" id="foreground">
                            <property name="valign">baseline</property>
                            <property name="rgba">black</property>
                            <signal name="notify::rgba" handler="color_set_cb"/>
@@ -221,11 +214,7 @@
                          </object>
                        </child>
                        <child>
-                          <object class="GtkColorDialogButton" id="background">
-                            <property name="dialog">
-                              <object class="GtkColorDialog">
-                              </object>
-                            </property>
+                          <object class="GtkColorButton" id="background">
                            <property name="valign">baseline</property>
                            <property name="rgba">white</property>
                            <signal name="notify::rgba" handler="color_set_cb"/>
@@ -270,10 +259,16 @@
                          <object class="GtkBox" id="feature_list">
                            <property name="orientation">vertical</property>
                            <child>
-                              <object class="GtkDropDown" id="script_lang">
+                              <object class="GtkComboBox" id="script_lang">
                                <property name="tooltip-text" translatable="yes">Language System</property>
                                <property name="margin-top">10</property>
-                                <signal name="notify::selected" handler="font_features_script_changed" swapped="no"/>
+                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <child>
+                                  <object class="GtkCellRendererText"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
                              </object>
                            </child>
                          </object>
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -10,6 +10,8 @@

 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *window = NULL;
 static GtkWidget *font_button = NULL;
 static GtkWidget *entry = NULL;
@@ -43,6 +45,7 @@ update_image (void)
  cairo_t *cr;
  GdkPixbuf *pixbuf;
  GdkPixbuf *pixbuf2;
+  const char *hint;
  cairo_font_options_t *fopt;
  cairo_hint_style_t hintstyle;
  cairo_hint_metrics_t hintmetrics;
@@ -53,27 +56,22 @@ update_image (void)
    context = gtk_widget_create_pango_context (image);

  text = gtk_editable_get_text (GTK_EDITABLE (entry));
-  desc = gtk_font_dialog_button_get_font_desc (GTK_FONT_DIALOG_BUTTON (font_button));
+  desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (font_button));

  fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));

-  switch (gtk_drop_down_get_selected (GTK_DROP_DOWN (hinting)))
+  hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
+  hintstyle = CAIRO_HINT_STYLE_DEFAULT;
+  if (hint)
    {
-    case 0:
-      hintstyle = CAIRO_HINT_STYLE_NONE;
-      break;
-    case 1:
-      hintstyle = CAIRO_HINT_STYLE_SLIGHT;
-      break;
-    case 2:
-      hintstyle = CAIRO_HINT_STYLE_MEDIUM;
-      break;
-    case 3:
-      hintstyle = CAIRO_HINT_STYLE_FULL;
-      break;
-    default:
-      hintstyle = CAIRO_HINT_STYLE_DEFAULT;
-      break;
+      if (strcmp (hint, "none") == 0)
+        hintstyle = CAIRO_HINT_STYLE_NONE;
+      else if (strcmp (hint, "slight") == 0)
+        hintstyle = CAIRO_HINT_STYLE_SLIGHT;
+      else if (strcmp (hint, "medium") == 0)
+        hintstyle = CAIRO_HINT_STYLE_MEDIUM;
+      else if (strcmp (hint, "full") == 0)
+        hintstyle = CAIRO_HINT_STYLE_FULL;
    }
  cairo_font_options_set_hint_style (fopt, hintstyle);

@@ -287,6 +285,8 @@ retry:
  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);

  g_object_unref (pixbuf2);
+
+  pango_font_description_free (desc);
 }

 static gboolean fading = FALSE;
@@ -420,7 +420,7 @@ do_fontrendering (GtkWidget *do_widget)
      g_signal_connect (down_button, "clicked", G_CALLBACK (scale_down), NULL);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_image), NULL);
      g_signal_connect (font_button, "notify::font-desc", G_CALLBACK (update_image), NULL);
-      g_signal_connect (hinting, "notify::selected", G_CALLBACK (update_image), NULL);
+      g_signal_connect (hinting, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (anti_alias, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (hint_metrics, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (text_radio, "notify::active", G_CALLBACK (update_image), NULL);
@@ -435,7 +435,7 @@ do_fontrendering (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -74,11 +74,7 @@
              </object>
            </child>
            <child>
-              <object class="GtkFontDialogButton" id="font_button">
-                <property name="dialog">
-                  <object class="GtkFontDialog">
-                  </object>
-                </property>
+              <object class="GtkFontButton" id="font_button">
                <layout>
                  <property name="column">2</property>
                  <property name="row">1</property>
@@ -120,18 +116,15 @@
                  </object>
                </child>
                <child>
-                  <object class="GtkDropDown" id="hinting">
+                  <object class="GtkComboBoxText" id="hinting">
+                    <property name="active">0</property>
                    <property name="valign">center</property>
-                    <property name="model">
-                      <object class="GtkStringList">
-                        <items>
-                          <item translatable="yes">None</item>
-                          <item translatable="yes">Slight</item>
-                          <item translatable="yes">Medium</item>
-                          <item translatable="yes">Full</item>
-                        </items>
-                      </object>
-                    </property>
+                    <items>
+                      <item translatable="yes" id="none">None</item>
+                      <item translatable="yes" id="slight">Slight</item>
+                      <item translatable="yes" id="medium">Medium</item>
+                      <item translatable="yes" id="full">Full</item>
+                    </items>
                  </object>
                </child>
                <layout>
--- a/demos/gtk-demo/frames.c
+++ b/demos/gtk-demo/frames.c
@@ -157,7 +157,7 @@ do_frames (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/gears.c
+++ b/demos/gtk-demo/gears.c
@@ -54,6 +54,7 @@ create_axis_slider (GtkGears *gears,

  label = gtk_label_new (text);
  gtk_box_append (GTK_BOX (box), label);
+  gtk_widget_show (label);

  adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
  g_object_set_data (G_OBJECT (adj), "axis", GINT_TO_POINTER (axis));
@@ -64,6 +65,9 @@ create_axis_slider (GtkGears *gears,
  gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
  gtk_box_append (GTK_BOX (box), slider);
  gtk_widget_set_vexpand (slider, TRUE);
+  gtk_widget_show (slider);
+
+  gtk_widget_show (box);

  return box;
 }
@@ -125,7 +129,7 @@ do_gears (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -208,7 +208,7 @@ do_gestures (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -355,6 +355,7 @@ create_axis_slider (int axis)

  label = gtk_label_new (text);
  gtk_box_append (GTK_BOX (box), label);
+  gtk_widget_show (label);

  adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
  g_signal_connect (adj, "value-changed",
@@ -363,6 +364,9 @@ create_axis_slider (int axis)
  slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
  gtk_box_append (GTK_BOX (box), slider);
  gtk_widget_set_hexpand (slider, TRUE);
+  gtk_widget_show (slider);
+
+  gtk_widget_show (box);

  return box;
 }
@@ -436,7 +440,7 @@ do_glarea (GtkWidget *do_widget)
    demo_window = create_glarea_window (do_widget);

  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
  else
    gtk_window_destroy (GTK_WINDOW (demo_window));

--- a/demos/gtk-demo/gltransition.c
+++ b/demos/gtk-demo/gltransition.c
@@ -20,6 +20,8 @@
 #include "gtkshadertoy.h"
 #include "gskshaderpaintable.h"

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *demo_window = NULL;

 static void
@@ -33,7 +35,7 @@ static void
 text_changed (GtkTextBuffer *buffer,
              GtkWidget     *button)
 {
-  gtk_widget_set_visible (button, TRUE);
+  gtk_widget_show (button);
 }

 static void
@@ -58,7 +60,7 @@ apply_text (GtkWidget     *button,
  g_object_unref (shader);
  g_bytes_unref (bytes);

-  gtk_widget_set_visible (button, FALSE);
+  gtk_widget_hide (button);
 }

 static void
@@ -144,6 +146,7 @@ make_shader_stack (const char *name,
  GtkTextBuffer *buffer;
  GBytes *bytes;
  GtkEventController *controller;
+  GtkCssProvider *provider;
  GdkPaintable *paintable;

  stack = gtk_shader_stack_new ();
@@ -234,10 +237,16 @@ make_shader_stack (const char *name,
  g_signal_connect (buffer, "changed", G_CALLBACK (text_changed), button);
  g_object_set_data (G_OBJECT (button), "the-stack", stack);
  g_signal_connect (button, "clicked", G_CALLBACK (apply_text), buffer);
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (provider, "button.small { padding: 0; }", -1);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (button),
+                                  GTK_STYLE_PROVIDER (provider),
+                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  g_object_unref (provider);
  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
  gtk_widget_add_css_class (button, "small");
-  gtk_widget_set_visible (button, FALSE);
+  gtk_widget_hide (button);
  gtk_center_box_set_end_widget (GTK_CENTER_BOX (widget), button);

  gtk_box_append (GTK_BOX (vbox), widget);
@@ -267,21 +276,11 @@ make_shader_stack (const char *name,
  return vbox;
 }

-static void
-remove_provider (gpointer data)
-{
-  GtkStyleProvider *provider = GTK_STYLE_PROVIDER (data);
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-  g_object_unref (provider);
-}
-
 static GtkWidget *
 create_gltransition_window (GtkWidget *do_widget)
 {
  GtkWidget *window, *headerbar, *scale, *outer_grid, *grid, *background;
  GdkPaintable *paintable;
-  GtkCssProvider *provider;

  window = gtk_window_new ();
  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
@@ -336,14 +335,6 @@ create_gltransition_window (GtkWidget *do_widget)
                   make_shader_stack ("Kaleidoscope", "/gltransition/kaleidoscope.glsl", 3, scale),
                   1, 1, 1, 1);

-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, "button.small { padding: 0; }", -1);
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-  g_object_set_data_full (G_OBJECT (window), "provider", provider, remove_provider);
-
  return window;
 }

@@ -354,7 +345,7 @@ do_gltransition (GtkWidget *do_widget)
    demo_window = create_gltransition_window (do_widget);

  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
  else
    gtk_window_destroy (GTK_WINDOW (demo_window));

--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -50,7 +50,7 @@ do_headerbar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -399,7 +399,7 @@ do_hypertext (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -378,7 +378,7 @@ do_iconscroll (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -320,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -1,5 +1,4 @@
 /* Icon View/Editing and Drag-and-Drop
- * #Keywords: dnd
 *
 * The GtkIconView widget supports Editing and Drag-and-Drop.
 * This example also demonstrates using the generic GtkCellLayout
@@ -151,7 +150,7 @@ do_iconview_edit (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -83,17 +83,24 @@ progressive_timeout (gpointer data)

      if (bytes_read < 0)
        {
-          GtkAlertDialog *dialog;
+          GtkWidget *dialog;

-          dialog = gtk_alert_dialog_new ("Failure reading image file 'alphatest.png': %s",
-                                         error->message);
-          gtk_alert_dialog_show (dialog, NULL);
-          g_object_unref (dialog);
+          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           GTK_MESSAGE_ERROR,
+                                           GTK_BUTTONS_CLOSE,
+                                           "Failure reading image file 'alphatest.png': %s",
+                                           error->message);
          g_error_free (error);

+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), NULL);
+
          g_object_unref (image_stream);
          image_stream = NULL;

+          gtk_widget_show (dialog);
+
          load_timeout = 0;

          return FALSE; /* uninstall the timeout */
@@ -103,17 +110,25 @@ progressive_timeout (gpointer data)
                                    buf, bytes_read,
                                    &error))
        {
-          GtkAlertDialog *dialog;
+          GtkWidget *dialog;
+
+          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           GTK_MESSAGE_ERROR,
+                                           GTK_BUTTONS_CLOSE,
+                                           "Failed to load image: %s",
+                                           error->message);

-          dialog = gtk_alert_dialog_new ("Failed to load image: %s",
-                                         error->message);
-          gtk_alert_dialog_show (dialog, NULL);
-          g_object_unref (dialog);
          g_error_free (error);

+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), NULL);
+
          g_object_unref (image_stream);
          image_stream = NULL;

+          gtk_widget_show (dialog);
+
          load_timeout = 0;

          return FALSE; /* uninstall the timeout */
@@ -128,14 +143,22 @@ progressive_timeout (gpointer data)
          error = NULL;
          if (!g_input_stream_close (image_stream, NULL, &error))
            {
-              GtkAlertDialog *dialog;
+              GtkWidget *dialog;
+
+              dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                                               GTK_MESSAGE_ERROR,
+                                               GTK_BUTTONS_CLOSE,
+                                               "Failed to load image: %s",
+                                               error->message);

-              dialog = gtk_alert_dialog_new ("Failed to load image: %s",
-                                             error->message);
-              gtk_alert_dialog_show (dialog, NULL);
-              g_object_unref (dialog);
              g_error_free (error);

+              g_signal_connect (dialog, "response",
+                                G_CALLBACK (gtk_window_destroy), NULL);
+
+              gtk_widget_show (dialog);
+
              g_object_unref (image_stream);
              image_stream = NULL;
              g_object_unref (pixbuf_loader);
@@ -154,16 +177,25 @@ progressive_timeout (gpointer data)
           * it was incomplete.
           */
          error = NULL;
-          if (!gdk_pixbuf_loader_close (pixbuf_loader, &error))
+          if (!gdk_pixbuf_loader_close (pixbuf_loader,
+                                        &error))
            {
-              GtkAlertDialog *dialog;
+              GtkWidget *dialog;
+
+              dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                               GTK_DIALOG_DESTROY_WITH_PARENT,
+                                               GTK_MESSAGE_ERROR,
+                                               GTK_BUTTONS_CLOSE,
+                                               "Failed to load image: %s",
+                                               error->message);

-              dialog = gtk_alert_dialog_new ("Failed to load image: %s",
-                                             error->message);
-              gtk_alert_dialog_show (dialog, NULL);
-              g_object_unref (dialog);
              g_error_free (error);

+              g_signal_connect (dialog, "response",
+                                G_CALLBACK (gtk_window_destroy), NULL);
+
+              gtk_widget_show (dialog);
+
              g_object_unref (pixbuf_loader);
              pixbuf_loader = NULL;

@@ -184,14 +216,20 @@ progressive_timeout (gpointer data)

      if (image_stream == NULL)
        {
-          GtkAlertDialog *dialog;
+          GtkWidget *dialog;

-          dialog = gtk_alert_dialog_new ("%s",
-                                         error->message);
-          gtk_alert_dialog_show (dialog, NULL);
-          g_object_unref (dialog);
+          dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           GTK_MESSAGE_ERROR,
+                                           GTK_BUTTONS_CLOSE,
+                                           "%s", error->message);
          g_error_free (error);

+          g_signal_connect (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), NULL);
+
+          gtk_widget_show (dialog);
+
          load_timeout = 0;

          return FALSE; /* uninstall the timeout */
@@ -422,7 +460,7 @@ do_images (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -7,15 +7,13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 on_bar_response (GtkInfoBar *info_bar,
                 int         response_id,
                 gpointer    user_data)
 {
-  GtkAlertDialog *dialog;
-  char *detail;
+  GtkWidget *dialog;
+  GtkWidget *window;

  if (response_id == GTK_RESPONSE_CLOSE)
    {
@@ -23,12 +21,19 @@ on_bar_response (GtkInfoBar *info_bar,
      return;
    }

-  dialog = gtk_alert_dialog_new ("You clicked a button on an info bar");
-  detail = g_strdup_printf ("Your response has been %d", response_id);
-  gtk_alert_dialog_set_detail (dialog, detail);
-  g_free (detail);
-  gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (info_bar))));
-  g_object_unref (dialog);
+  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (info_bar)));
+  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+                                   GTK_MESSAGE_INFO,
+                                   GTK_BUTTONS_OK,
+                                   "You clicked a button on an info bar");
+  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                            "Your response has id %d", response_id);
+
+  g_signal_connect_swapped (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), dialog);
+
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -140,7 +145,7 @@ do_infobar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/language-names.c
+++ b/demos/gtk-demo/language-names.c
@@ -311,12 +311,5 @@ get_language_name_for_tag (guint32 tag)
  lang = hb_ot_tag_to_language (tag);
  s = hb_language_to_string (lang);

-  if (strcmp (s, "und-fonipa") == 0)
-    return "International Phonetic Alphabet";
-  else if (strcmp (s, "und-fonnapa") == 0)
-    return "North-American Phonetic Alphabet";
-  else if (strcmp (s, "ro-md") == 0)
-    return "Moldavian";
-
  return get_language_name (pango_language_from_string (s));
 }
--- a/demos/gtk-demo/layoutmanager.c
+++ b/demos/gtk-demo/layoutmanager.c
@@ -54,7 +54,7 @@ do_layoutmanager (GtkWidget *parent)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/layoutmanager2.c
+++ b/demos/gtk-demo/layoutmanager2.c
@@ -190,7 +190,7 @@ do_layoutmanager2 (GtkWidget *parent)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -7,22 +7,38 @@

 #include <gtk/gtk.h>

+static void
+response_cb (GtkWidget *dialog,
+             int        response_id,
+             gpointer   data)
+{
+  gtk_window_destroy (GTK_WINDOW (dialog));
+}
+
 static gboolean
-activate_link (GtkWidget  *label,
+activate_link (GtkWidget   *label,
               const char *uri,
-               gpointer    data)
+               gpointer     data)
 {
  if (g_strcmp0 (uri, "keynav") == 0)
    {
-      GtkAlertDialog *dialog;
+      GtkWidget *dialog;
+      GtkWidget *parent;

-      dialog = gtk_alert_dialog_new ("Keyboard navigation");
-      gtk_alert_dialog_set_detail (dialog,
-                                   "The term ‘keynav’ is a shorthand for "
-                                   "keyboard navigation and refers to the process of using "
-                                   "a program (exclusively) via keyboard input.");
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (label)));
-      g_object_unref (dialog);
+      parent = GTK_WIDGET (gtk_widget_get_root (label));
+      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
+                 GTK_DIALOG_DESTROY_WITH_PARENT,
+                 GTK_MESSAGE_INFO,
+                 GTK_BUTTONS_OK,
+                 "Keyboard navigation");
+      gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+                 "The term <i>keynav</i> is a shorthand for "
+                 "keyboard navigation and refers to the process of using "
+                 "a program (exclusively) via keyboard input.");
+      gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+      gtk_window_present (GTK_WINDOW (dialog));
+      g_signal_connect (dialog, "response", G_CALLBACK (response_cb), NULL);

      return TRUE;
    }
@@ -63,10 +79,11 @@ do_links (GtkWidget *do_widget)
      gtk_widget_set_margin_top (label, 20);
      gtk_widget_set_margin_bottom (label, 20);
      gtk_window_set_child (GTK_WINDOW (window), label);
+      gtk_widget_show (label);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -300,7 +300,7 @@ do_list_store (GtkWidget *do_widget)

  if (!gtk_widget_get_visible (window))
    {
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
      if (timeout == 0) {
        /* FIXME this should use the animation-duration instead */
        timeout = g_timeout_add (80, spinner_timeout, NULL);
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -380,6 +380,7 @@ do_listbox (GtkWidget *do_widget)
        {
          message = gtk_message_new (lines[i]);
          row = gtk_message_row_new (message);
+          gtk_widget_show (GTK_WIDGET (row));
          gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
        }

@@ -388,7 +389,7 @@ do_listbox (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listbox_controls.c
+++ b/demos/gtk-demo/listbox_controls.c
@@ -62,7 +62,7 @@ do_listbox_controls (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -117,16 +117,19 @@ activate_cb (GtkListView  *list,
                          G_APP_LAUNCH_CONTEXT (context),
                          &error))
    {
-      GtkAlertDialog *dialog;
+      GtkWidget *dialog;

      /* And because error handling is important, even a simple demo has it:
       * We display an error dialog that something went wrong.
       */
-      dialog = gtk_alert_dialog_new ("Could not launch %s", g_app_info_get_display_name (app_info));
-      gtk_alert_dialog_set_detail (dialog, error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))));
-      g_object_unref (dialog);
+      dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "Could not launch %s", g_app_info_get_display_name (app_info));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
      g_clear_error (&error);
+      gtk_widget_show (dialog);
    }

  g_object_unref (context);
@@ -191,7 +194,7 @@ do_listview_applauncher (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_clocks.c
+++ b/demos/gtk-demo/listview_clocks.c
@@ -494,7 +494,7 @@ do_listview_clocks (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_colors.c
+++ b/demos/gtk-demo/listview_colors.c
@@ -1124,7 +1124,7 @@ do_listview_colors (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_filebrowser.c
+++ b/demos/gtk-demo/listview_filebrowser.c
@@ -275,7 +275,7 @@ do_listview_filebrowser (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_minesweeper.c
+++ b/demos/gtk-demo/listview_minesweeper.c
@@ -485,7 +485,7 @@ do_listview_minesweeper (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_settings.c
+++ b/demos/gtk-demo/listview_settings.c
@@ -422,15 +422,11 @@ do_listview_settings (GtkWidget *do_widget)
      gtk_column_view_column_set_sorter (name_column, sorter);
      g_object_unref (sorter);

-      sorter = GTK_SORTER (gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "type")));
-      gtk_column_view_column_set_sorter (type_column, sorter);
-      g_object_unref (sorter);
-
      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_ucd.c
+++ b/demos/gtk-demo/listview_ucd.c
@@ -10,6 +10,8 @@
 #include "script-names.h"
 #include "unicode-names.h"

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 #define UCD_TYPE_ITEM (ucd_item_get_type ())
 G_DECLARE_FINAL_TYPE (UcdItem, ucd_item, UCD, ITEM, GObject)

@@ -337,15 +339,6 @@ create_ucd_view (GtkWidget *label)

 static GtkWidget *window;

-static void
-remove_provider (gpointer data)
-{
-  GtkStyleProvider *provider = GTK_STYLE_PROVIDER (data);
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-  g_object_unref (provider);
-}
-
 GtkWidget *
 do_listview_ucd (GtkWidget *do_widget)
 {
@@ -368,7 +361,7 @@ do_listview_ucd (GtkWidget *do_widget)
      gtk_widget_add_css_class (label, "enormous");
      provider = gtk_css_provider_new ();
      gtk_css_provider_load_from_data (provider, "label.enormous { font-size: 80px; }", -1);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), 800);
+      gtk_style_context_add_provider (gtk_widget_get_style_context (label), GTK_STYLE_PROVIDER (provider), 800);
      gtk_widget_set_hexpand (label, TRUE);
      gtk_box_append (GTK_BOX (box), label);

@@ -378,12 +371,10 @@ do_listview_ucd (GtkWidget *do_widget)
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
      gtk_box_prepend (GTK_BOX (box), sw);
      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      g_object_set_data_full (G_OBJECT (window), "provider", provider, remove_provider);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_weather.c
+++ b/demos/gtk-demo/listview_weather.c
@@ -317,7 +317,7 @@ do_listview_weather (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/listview_words.c
+++ b/demos/gtk-demo/listview_words.c
@@ -42,7 +42,7 @@ update_title_cb (GtkFilterListModel *model)
  title = g_strdup_printf ("%u lines", g_list_model_get_n_items (G_LIST_MODEL (model)));

  gtk_widget_set_visible (progress, pending != 0);
-  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), total > 0 ? (total - pending) / (double) total : 0.);
+  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), (total - pending) / (double) total);
  gtk_window_set_title (GTK_WINDOW (window), title);
  g_free (title);
 }
@@ -141,35 +141,39 @@ load_file (GtkStringList *list,
 }

 static void
-open_response_cb (GObject *source,
-                  GAsyncResult *result,
-                  void *user_data)
+open_response_cb (GtkNativeDialog *dialog,
+                  int              response,
+                  GtkStringList   *stringlist)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GtkStringList *stringlist = GTK_STRING_LIST (user_data);
-  GFile *file;
+  gtk_native_dialog_hide (dialog);

-  file = gtk_file_dialog_open_finish (dialog, result, NULL);
-  if (file)
+  if (response == GTK_RESPONSE_ACCEPT)
    {
+      GFile *file;
+
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      load_file (stringlist, file);
      g_object_unref (file);
    }
+
+  gtk_native_dialog_destroy (dialog);
 }

 static void
 file_open_cb (GtkWidget     *button,
              GtkStringList *stringlist)
 {
-  GtkFileDialog *dialog;
+  GtkFileChooserNative *dialog;

-  dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog,
-                        GTK_WINDOW (gtk_widget_get_root (button)),
-                        NULL,
-                        NULL,
-                        open_response_cb, stringlist);
-  g_object_unref (dialog);
+  dialog = gtk_file_chooser_native_new ("Open file",
+                                        GTK_WINDOW (gtk_widget_get_root (button)),
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+                                        "_Load",
+                                        "_Cancel");
+  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+
+  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), stringlist);
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }

 GtkWidget *
@@ -249,7 +253,7 @@ do_listview_words (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -463,6 +463,7 @@ add_data_tab (const char *demoname)
        widget = display_nothing (resource_name);

      label = gtk_label_new (label_string ? label_string : resources[i]);
+      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
      g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
                    "tab-expand", FALSE,
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -62,6 +62,7 @@ do_markup (GtkWidget *do_widget)
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      stack = gtk_stack_new ();
+      gtk_widget_show (stack);
      gtk_window_set_child (GTK_WINDOW (window), stack);

      show_source = gtk_check_button_new_with_label ("Source");
@@ -117,10 +118,12 @@ do_markup (GtkWidget *do_widget)
      gtk_text_buffer_end_irreversible_action (buffer);

      g_bytes_unref (bytes);
+
+      gtk_widget_show (stack);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/menu.c
+++ b/demos/gtk-demo/menu.c
@@ -53,7 +53,7 @@ do_menu (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -84,7 +84,7 @@ do_overlay (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/overlay_decorative.c
+++ b/demos/gtk-demo/overlay_decorative.c
@@ -94,7 +94,7 @@ do_overlay_decorative (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/pagesetup.c
+++ b/demos/gtk-demo/pagesetup.c
@@ -28,7 +28,7 @@ do_pagesetup (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -7,8 +7,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 enum {
  COLOR_SET,
  N_SIGNALS
@@ -53,8 +51,8 @@ static const char *pad_colors[] = {
 static GType drawing_area_get_type (void);
 G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)

-static void drawing_area_set_color (DrawingArea   *area,
-                                    const GdkRGBA *color);
+static void drawing_area_set_color (DrawingArea *area,
+                                    GdkRGBA     *color);

 static void
 drawing_area_ensure_surface (DrawingArea *area,
@@ -352,8 +350,8 @@ drawing_area_new (void)
 }

 static void
-drawing_area_set_color (DrawingArea   *area,
-                        const GdkRGBA *color)
+drawing_area_set_color (DrawingArea *area,
+                        GdkRGBA     *color)
 {
  if (gdk_rgba_equal (&area->draw_color, color))
    return;
@@ -363,22 +361,21 @@ drawing_area_set_color (DrawingArea   *area,
 }

 static void
-color_button_color_set (GtkColorDialogButton *button,
-                        GParamSpec           *pspec,
-                        DrawingArea          *draw_area)
+color_button_color_set (GtkColorButton *button,
+                        DrawingArea    *draw_area)
 {
-  const GdkRGBA *color;
+  GdkRGBA color;

-  color = gtk_color_dialog_button_get_rgba (button);
-  drawing_area_set_color (draw_area, color);
+  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
+  drawing_area_set_color (draw_area, &color);
 }

 static void
-drawing_area_color_set (DrawingArea          *area,
-                        GdkRGBA              *color,
-                        GtkColorDialogButton *button)
+drawing_area_color_set (DrawingArea    *area,
+                        GdkRGBA        *color,
+                        GtkColorButton *button)
 {
-  gtk_color_dialog_button_set_rgba (button, color);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button), color);
 }

 GtkWidget *
@@ -397,13 +394,13 @@ do_paint (GtkWidget *toplevel)

      headerbar = gtk_header_bar_new ();

-      colorbutton = gtk_color_dialog_button_new (gtk_color_dialog_new ());
-      g_signal_connect (colorbutton, "notify::rgba",
+      colorbutton = gtk_color_button_new ();
+      g_signal_connect (colorbutton, "color-set",
                        G_CALLBACK (color_button_color_set), draw_area);
      g_signal_connect (draw_area, "color-set",
                        G_CALLBACK (drawing_area_color_set), colorbutton);
-      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (colorbutton),
-                                        &(GdkRGBA) { 0, 0, 0, 1 });
+      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (colorbutton),
+                                  &(GdkRGBA) { 0, 0, 0, 1 });

      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
@@ -412,7 +409,7 @@ do_paint (GtkWidget *toplevel)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -175,7 +175,7 @@ do_paintable (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -214,7 +214,7 @@ do_paintable_animated (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paintable_emblem.c
+++ b/demos/gtk-demo/paintable_emblem.c
@@ -177,7 +177,7 @@ do_paintable_emblem (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -307,7 +307,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/paintable_svg.c
+++ b/demos/gtk-demo/paintable_svg.c
@@ -13,24 +13,25 @@


 static void
-open_response_cb (GObject *source,
-                  GAsyncResult *result,
-                  void *data)
+open_response_cb (GtkNativeDialog *dialog,
+                  int              response,
+                  GtkPicture      *picture)
 {
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GtkPicture *picture = data;
-  GFile *file;
+  gtk_native_dialog_hide (dialog);

-  file = gtk_file_dialog_open_finish (dialog, result, NULL);
-  if (file)
+  if (response == GTK_RESPONSE_ACCEPT)
    {
+      GFile *file;
      GdkPaintable *paintable;

+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
      paintable = svg_paintable_new (file);
      gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
      g_object_unref (paintable);
      g_object_unref (file);
    }
+
+  gtk_native_dialog_destroy (dialog);
 }

 static void
@@ -38,25 +39,20 @@ show_file_open (GtkWidget  *button,
                GtkPicture *picture)
 {
  GtkFileFilter *filter;
-  GtkFileDialog *dialog;
-  GListStore *filters;
+  GtkFileChooserNative *dialog;

-  dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_set_title (dialog, "Open node file");
+  dialog = gtk_file_chooser_native_new ("Open node file",
+                                        GTK_WINDOW (gtk_widget_get_root (button)),
+                                        GTK_FILE_CHOOSER_ACTION_OPEN,
+                                        "_Load",
+                                        "_Cancel");

  filter = gtk_file_filter_new ();
  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
-  g_object_unref (filters);
-
-  gtk_file_dialog_open (dialog,
-                        GTK_WINDOW (gtk_widget_get_root (button)),
-                        NULL,
-                        NULL,
-                        open_response_cb, picture);
+  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
+  gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
+  g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), picture);
+  gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }

 static GtkWidget *window;
--- a/demos/gtk-demo/paintable_symbolic.c
+++ b/demos/gtk-demo/paintable_symbolic.c
@@ -200,7 +200,7 @@ do_paintable_symbolic (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -82,7 +82,7 @@ do_panes (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/password_entry.c
+++ b/demos/gtk-demo/password_entry.c
@@ -90,7 +90,7 @@ do_password_entry (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -1,5 +1,5 @@
 /* Peg Solitaire
- * #Keywords: GtkGridView, game, drag-and-drop, dnd
+ * #Keywords: GtkGridView, game
 *
 * This demo demonstrates how to use drag-and-drop to implement peg solitaire.
 *
@@ -8,6 +8,7 @@
 #include "config.h"
 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS

 /* Create an object for the pegs that get moved around in the game.
 *
@@ -360,15 +361,6 @@ drop_drop (GtkDropTarget *target,
  return TRUE;
 }

-static void
-remove_provider (gpointer data)
-{
-  GtkStyleProvider *provider = GTK_STYLE_PROVIDER (data);
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-  g_object_unref (provider);
-}
-
 static void
 create_board (GtkWidget *window)
 {
@@ -385,9 +377,6 @@ create_board (GtkWidget *window)

  provider = gtk_css_provider_new ();
  gtk_css_provider_load_from_data (provider, css, -1);
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);

  grid = gtk_grid_new ();
  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
@@ -406,6 +395,9 @@ create_board (GtkWidget *window)
            continue;

          image = gtk_image_new ();
+          gtk_style_context_add_provider (gtk_widget_get_style_context (image),
+                                          GTK_STYLE_PROVIDER (provider),
+                                          800);
          gtk_widget_add_css_class (image, "solitaire-field");
          gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
          if (x != 3 || y != 3)
@@ -449,7 +441,7 @@ create_board (GtkWidget *window)
        }
    }

-  g_object_set_data_full (G_OBJECT (window), "provider", provider, remove_provider);
+  g_object_unref (provider);
 }

 static void
@@ -487,7 +479,7 @@ do_peg_solitaire (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -1,5 +1,5 @@
 /* Pickers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog
+ * #Keywords: GtkColorChooser, GtkFontChooser, GtkApplicationChooser
 *
 * These widgets are mainly intended for use in preference dialogs.
 * They allow to select colors, fonts and applications.
@@ -10,66 +10,55 @@

 #include <gtk/gtk.h>

-static void
-file_opened (GObject *source,
-             GAsyncResult *result,
-             void *data)
-{
-  GFile *file;
-  GError *error = NULL;
-  char *name;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  name = g_file_get_basename (file);
-  gtk_label_set_label (GTK_LABEL (data), name);
-  g_free (name);
-}
-
 static gboolean
-abort_mission (gpointer data)
+filter_font_cb (const PangoFontFamily *family,
+                const PangoFontFace   *face,
+                gpointer               data)
 {
-  GCancellable *cancellable = data;
+  const char *alias_families[] = {
+    "Cursive",
+    "Fantasy",
+    "Monospace",
+    "Sans",
+    "Serif",
+    "System-ui",
+    NULL
+  };
+  const char *family_name;

-  g_cancellable_cancel (cancellable);
+  family_name = pango_font_family_get_name (PANGO_FONT_FAMILY (family));

-  return G_SOURCE_REMOVE;
+  return g_strv_contains (alias_families, family_name);
 }

-static void
-open_file (GtkButton *picker,
-           GtkLabel  *label)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkFileDialog *dialog;
-  GCancellable *cancellable;
-
-  dialog = gtk_file_dialog_new ();
-
-  cancellable = g_cancellable_new ();
-
-  g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
-                              20,
-                              abort_mission, g_object_ref (cancellable), g_object_unref);
-
-  gtk_file_dialog_open (dialog, parent, NULL, cancellable, file_opened, label);
-
-  g_object_unref (cancellable);
-  g_object_unref (dialog);
-}
+#define COLOR(r,g,b) { r/255., g/255., b/255., 1.0 }

 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  GtkWidget *table, *label, *picker, *button;
+  GtkWidget *table, *label, *picker;
+  GdkRGBA solarized[] = {
+    COLOR (0xff, 0xff, 0xff),
+    COLOR (0x07, 0x36, 0x42),
+    COLOR (0xdc, 0x32, 0x2f),
+    COLOR (0x85, 0x99, 0x00),
+    COLOR (0xb5, 0x89, 0x00),
+    COLOR (0x26, 0x8b, 0xd2),
+    COLOR (0xd3, 0x36, 0x82),
+    COLOR (0x2a, 0xa1, 0x98),
+    COLOR (0xee, 0xe8, 0xd5),
+
+    COLOR (0x00, 0x00, 0x00),
+    COLOR (0x00, 0x2b, 0x36),
+    COLOR (0xcb, 0x4b, 0x16),
+    COLOR (0x58, 0x6e, 0x75),
+    COLOR (0x65, 0x7b, 0x83),
+    COLOR (0x83, 0x94, 0x96),
+    COLOR (0x6c, 0x71, 0xc4),
+    COLOR (0x93, 0xa1, 0xa1),
+    COLOR (0xfd, 0xf6, 0xe3),
+  };

  if (!window)
  {
@@ -88,48 +77,55 @@ do_pickers (GtkWidget *do_widget)
    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
    gtk_window_set_child (GTK_WINDOW (window), table);

+    label = gtk_label_new ("Standard");
+    gtk_widget_add_css_class (label, "title-4");
+    gtk_grid_attach (GTK_GRID (table), label, 1, -1, 1, 1);
+    label = gtk_label_new ("Custom");
+    gtk_widget_add_css_class (label, "title-4");
+    gtk_grid_attach (GTK_GRID (table), label, 2, -1, 1, 1);
+
    label = gtk_label_new ("Color:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_hexpand (label, TRUE);
    gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);

-    picker = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+    picker = gtk_color_button_new ();
    gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1);

+    picker = gtk_color_button_new ();
+    gtk_color_button_set_title (GTK_COLOR_BUTTON (picker), "Solarized colors");
+    gtk_color_chooser_add_palette (GTK_COLOR_CHOOSER (picker),
+                                   GTK_ORIENTATION_HORIZONTAL,
+                                   9,
+                                   18,
+                                   solarized);
+    gtk_grid_attach (GTK_GRID (table), picker, 2, 0, 1, 1);
+
    label = gtk_label_new ("Font:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_hexpand (label, TRUE);
    gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);

-    picker = gtk_font_dialog_button_new (gtk_font_dialog_new ());
+    picker = gtk_font_button_new ();
    gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1);

-    label = gtk_label_new ("File:");
-    gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-    gtk_widget_set_hexpand (label, TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
+    picker = gtk_font_button_new ();
+    gtk_font_chooser_set_level (GTK_FONT_CHOOSER (picker),
+                                GTK_FONT_CHOOSER_LEVEL_FAMILY |
+                                GTK_FONT_CHOOSER_LEVEL_SIZE);
+    gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (picker), filter_font_cb, NULL, NULL);

-    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-    button = gtk_button_new_from_icon_name ("document-open-symbolic");
-    label = gtk_label_new ("None");
-    gtk_label_set_xalign (GTK_LABEL (label), 0.);
-    gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
-    gtk_widget_set_hexpand (label, TRUE);
-    g_signal_connect (button, "clicked", G_CALLBACK (open_file), label);
-    gtk_box_append (GTK_BOX (picker), label);
-    gtk_box_append (GTK_BOX (picker), button);
-    gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    gtk_grid_attach (GTK_GRID (table), picker, 2, 1, 1, 1);

    label = gtk_label_new ("Mail:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
    gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_hexpand (label, TRUE);

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);

@@ -140,7 +136,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/pixbufpaintable.c
+++ b/demos/gtk-demo/pixbufpaintable.c
@@ -16,6 +16,7 @@ enum {
  NUM_PROPERTIES
 };

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
 static void
 pixbuf_paintable_snapshot (GdkPaintable *paintable,
                           GdkSnapshot  *snapshot,
@@ -36,6 +37,7 @@ pixbuf_paintable_snapshot (GdkPaintable *paintable,

  g_object_unref (texture);
 }
+G_GNUC_END_IGNORE_DEPRECATIONS;

 static int
 pixbuf_paintable_get_intrinsic_width (GdkPaintable *paintable)
--- a/demos/gtk-demo/printing.c
+++ b/demos/gtk-demo/printing.c
@@ -177,12 +177,19 @@ do_printing (GtkWidget *do_widget)

  if (error)
    {
-      GtkAlertDialog *dialog;
+      GtkWidget *dialog;

-      dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (do_widget));
-      g_object_unref (dialog);
+      dialog = gtk_message_dialog_new (GTK_WINDOW (do_widget),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "%s", error->message);
      g_error_free (error);
+
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_window_destroy), NULL);
+
+      gtk_widget_show (dialog);
    }


--- a/demos/gtk-demo/read_more.c
+++ b/demos/gtk-demo/read_more.c
@@ -231,7 +231,7 @@ do_read_more (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -90,7 +90,7 @@ do_revealer (GtkWidget *do_widget)
    {
      count = 0;
      timeout = g_timeout_add (690, reveal_one, window);
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
    }
  else
    {
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -210,7 +210,7 @@ do_rotated_text (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/scale.c
+++ b/demos/gtk-demo/scale.c
@@ -27,7 +27,7 @@ do_scale (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -294,11 +294,13 @@ do_search_entry (GtkWidget *do_widget)
      g_signal_connect (find_button, "clicked",
                        G_CALLBACK (start_search), entry);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
+      gtk_widget_show (find_button);

      cancel_button = gtk_button_new_with_label ("Cancel");
      g_signal_connect (cancel_button, "clicked",
                        G_CALLBACK (stop_search), NULL);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
+      gtk_widget_show (cancel_button);

      /* Set up the search icon */
      gtk_entry_set_icon_activatable (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE);
@@ -312,7 +314,7 @@ do_search_entry (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    {
      g_clear_object (&actions);
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -91,7 +91,7 @@ do_search_entry2 (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/shadertoy.c
+++ b/demos/gtk-demo/shadertoy.c
@@ -194,7 +194,7 @@ do_shadertoy (GtkWidget *do_widget)
    demo_window = create_shadertoy_window (do_widget);

  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
  else
    gtk_window_destroy (GTK_WINDOW (demo_window));

--- a/demos/gtk-demo/shortcut_triggers.c
+++ b/demos/gtk-demo/shortcut_triggers.c
@@ -87,7 +87,7 @@ do_shortcut_triggers (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/shortcuts.c
+++ b/demos/gtk-demo/shortcuts.c
@@ -21,6 +21,7 @@ show_shortcuts (GtkWidget   *window,
  overlay = GTK_WIDGET (gtk_builder_get_object (builder, id));
  gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
  g_object_set (overlay, "view-name", view, NULL);
+  gtk_widget_show (overlay);
  g_object_unref (builder);
 }

@@ -94,7 +95,7 @@ do_shortcuts (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -74,7 +74,7 @@ do_sidebar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -16,6 +16,26 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+/* Convenience function to create a combo box holding a number of strings
+ */
+GtkWidget *
+create_combo_box (const char **strings)
+{
+  GtkWidget *combo_box;
+  const char **str;
+
+  combo_box = gtk_combo_box_text_new ();
+
+  for (str = strings; *str; str++)
+    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), *str);
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
+
+  return combo_box;
+}
+
 static void
 add_row (GtkGrid      *table,
         int           row,
@@ -23,7 +43,7 @@ add_row (GtkGrid      *table,
         const char   *label_text,
         const char  **options)
 {
-  GtkWidget *dropdown;
+  GtkWidget *combo_box;
  GtkWidget *label;

  label = gtk_label_new_with_mnemonic (label_text);
@@ -32,12 +52,12 @@ add_row (GtkGrid      *table,
  gtk_widget_set_hexpand (label, TRUE);
  gtk_grid_attach (table, label, 0, row, 1, 1);

-  dropdown = gtk_drop_down_new_from_strings (options);
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), dropdown);
-  gtk_widget_set_halign (dropdown, GTK_ALIGN_END);
-  gtk_widget_set_valign (dropdown, GTK_ALIGN_BASELINE);
-  gtk_size_group_add_widget (size_group, dropdown);
-  gtk_grid_attach (table, dropdown, 1, row, 1, 1);
+  combo_box = create_combo_box (options);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo_box);
+  gtk_widget_set_halign (combo_box, GTK_ALIGN_END);
+  gtk_widget_set_valign (combo_box, GTK_ALIGN_BASELINE);
+  gtk_size_group_add_widget (size_group, combo_box);
+  gtk_grid_attach (table, combo_box, 1, row, 1, 1);
 }

 static void
@@ -140,7 +160,7 @@ do_sizegroup (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -515,7 +515,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -236,7 +236,7 @@ do_spinbutton (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -35,7 +35,6 @@ do_spinner (GtkWidget *do_widget)

  if (!window)
  {
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    window = gtk_dialog_new_with_buttons ("Spinner",
                                          GTK_WINDOW (do_widget),
                                          0,
@@ -49,7 +48,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-G_GNUC_END_IGNORE_DEPRECATIONS

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    gtk_widget_set_margin_start (vbox, 5);
@@ -91,7 +89,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/demos/gtk-demo/stack.c
+++ b/demos/gtk-demo/stack.c
@@ -27,7 +27,7 @@ do_stack (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	019650ff26	columnview: Clarify docs Mention that gtk_column_view_sort_by_column can be called multiple times to ste up complex sorting.	2022-10-20 06:56:25 -04:00
Matthias Clasen	eb045fe936	columnview: Reimplement column view sorting Replace the private GtkColumnViewSorter implementation with a GtkMultiSorter containing GtkInvertibleSorters wrapping the individual column sorters.	2022-10-20 06:56:25 -04:00
Matthias Clasen	173f82772e	Add GtkInvertibleSorter This is a sorter that wraps another sorter and allows to invert its sort order.	2022-10-20 06:56:25 -04:00
Matthias Clasen	3d521d3b56	Add gtk_multi_sorter_splice There is no reason to have a weaker list api on this sorter than on a list store. We will need this function in the following commits.	2022-10-19 23:34:11 -04:00