GtkScaleButton: fix unwanted state propagation

GtkScaleButton/GtkVolumeButton use a popover
to show content. With the new GTK4 event model
clicking or hovering on that child popover produces
ACTIVE and PRELIGHT states that are propagated to
the main button, this is unwanted behaviour as the
button's appearance changes according to those.

We connect to the "state-flags-changed" signal of
GtkScaleButton, and remove the unwanted state flags
after verifying they're coming from the popover.

Fixes issue #2063

.gitlab-ci.yml

@@ -12,8 +12,8 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v8
+fedora-x86_64:
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -33,11 +33,6 @@ fedora-x86_64: &fedora-x86_64-defaults
     key: "$CI_JOB_NAME"
     <<: *cache-paths
 
-fedora-x86_64-staticlibs:
-  variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  <<: *fedora-x86_64-defaults
-
 .mingw-defaults: &mingw-defaults
   stage: build
   tags:

.gitlab-ci/Dockerfile

@@ -1,6 +1,7 @@
-FROM fedora:31
+FROM fedora:30
 
 RUN dnf -y install \
+    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -13,7 +14,6 @@ RUN dnf -y install \
     dbus-daemon \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
-    diffutils \
     elfutils-libelf-devel \
     fribidi-devel \
     gcc \
@@ -32,7 +32,6 @@ RUN dnf -y install \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
     gtk-doc \
-    hicolor-icon-theme \
     iso-codes \
     itstool \
     json-glib-devel \
@@ -53,7 +52,6 @@ RUN dnf -y install \
     libxkbcommon-devel \
     libXrandr-devel \
     libXrender-devel \
-    libXtst-devel \
     libxslt \
     mesa-dri-drivers \
     mesa-libEGL-devel \

.gitlab-ci/meson-html-report.py

@@ -149,11 +149,11 @@ ul.images li {
   <article>
     <section>
       <div class="summary">
-        <h3><a name="summary">Summary</a></h3>
+        <h3>Summary</h3>
         <ul>
           <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Passed:</strong> <a href="#passed">{{ report.total_successes }}</a></li>
-          <li><strong>Failed:</strong> <a href="#failures">{{ report.total_failures }}</a></li>
+          <li><strong>Passed:</strong> {{ report.total_successes }}</li>
+          <li><strong>Failed:</strong> {{ report.total_failures }}</li>
         </ul>
       </div>
     </section>
@@ -161,7 +161,7 @@ ul.images li {
     {% for suite_result in report.results_list %}
     <section>
       <div class="result">
-        <h3><a name="results">Suite: {{ suite_result.suite_name }}</a></h3>
+        <h3>Suite: {{ suite_result.suite_name }}</h3>
         <ul>
           <li><strong>Units:</strong> {{ suite_result.n_units }}</li>
           <li><strong>Passed:</strong> {{ suite_result.n_successes }}</li>
@@ -169,7 +169,7 @@ ul.images li {
         </ul>
 
         <div class="successes">
-          <h4><a name="passed">Passed</a></h4>
+          <h4>Passed</h4>
           <ul class="passed">
             {% for success in suite_result.successes if success.result == 'OK' %}
             <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
@@ -178,7 +178,7 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="skipped">Skipped</a></h4>
+          <h4>Skipped</h4>
           <ul>
             {% for success in suite_result.successes if success.result == 'SKIP' %}
             <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
@@ -187,10 +187,10 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="expected-fail">Expected failures</a></h4>
+          <h4>Expected failures</h4>
           <ul>
           {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
+            <li>{{ success.name }} - result: <span class="result xfail">{{ success.result }}</span><br/>
             {% if success.stdout %}
               Output: <pre>{{ success.stdout }}</pre>
             {% endif %}
@@ -209,10 +209,10 @@ ul.images li {
         </div>
 
         <div class="failures">
-          <h4><a name="failed">Failed</a></h4>
+          <h4>Failed</h4>
           <ul class="failed">
             {% for failure in suite_result.failures if failure.result == 'FAIL' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
+            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
               {% if failure.stdout %}
               Output: <pre>{{ failure.stdout }}</pre>
               {% endif %}
@@ -229,10 +229,10 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="timed-out">Timed out</a></h4>
+          <h4>Timed out</h4>
           <ul class="failed">
             {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
-            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
+            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
               {% if failure.stdout %}
               Output: <pre>{{ failure.stdout }}</pre>
               {% endif %}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

.gitlab-ci/test-docker.sh

@@ -17,7 +17,6 @@ meson \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
         --werror \
-        ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir
 unset CCACHE_DISABLE
 

.gitlab-ci/test-msys2.sh

@@ -33,10 +33,6 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
     mingw-w64-$MSYS2_ARCH-shared-mime-info
 
-# https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
-
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"

CONTRIBUTING.md

@@ -174,7 +174,7 @@ maintainers review your contribution.
 
 Each contribution is reviewed by the core developers of the GTK project.
 
-The [CODEOWNERS](./docs/CODEOWNERS) document contains the list of core
+The [CODE-OWNERS](./docs/CODE-OWNERS) document contains the list of core
 contributors to GTK and the areas for which they are responsible; you
 should ensure to receive their review and signoff on your changes.
 

demos/gtk-demo/application.c

@@ -419,7 +419,7 @@ demo_application_window_load_state (DemoApplicationWindow *win)
 static void
 demo_application_window_init (DemoApplicationWindow *window)
 {
-  GtkWidget *popover;
+  GtkWidget *menu;
 
   window->width = -1;
   window->height = -1;
@@ -428,8 +428,8 @@ demo_application_window_init (DemoApplicationWindow *window)
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
-  popover = gtk_popover_menu_new_from_model (window->menutool, window->toolmenu);
-  gtk_menu_tool_button_set_popover (GTK_MENU_TOOL_BUTTON (window->menutool), popover);
+  menu = gtk_menu_new_from_model (window->toolmenu);
+  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (window->menutool), menu);
 
   g_action_map_add_action_entries (G_ACTION_MAP (window),
                                    win_entries, G_N_ELEMENTS (win_entries),

demos/gtk-demo/application.ui

@@ -43,17 +43,25 @@
           <object class="GtkInfoBar" id="infobar">
             <property name="visible">0</property>
             <property name="hexpand">1</property>
-            <child>
-              <object class="GtkLabel" id="message">
-                <property name="hexpand">1</property>
+            <child internal-child="content_area">
+              <object class="GtkBox" id="content_area">
+                <child>
+                  <object class="GtkLabel" id="message">
+                    <property name="hexpand">1</property>
+                  </object>
+                </child>
               </object>
             </child>
-            <child type="action">
-              <object class="GtkButton">
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_OK</property>
-                <property name="use-underline">1</property>
-                <signal name="clicked" handler="clicked_cb"/>
+            <child internal-child="action_area">
+              <object class="GtkBox">
+                <child>
+                  <object class="GtkButton">
+                    <property name="valign">center</property>
+                    <property name="label" translatable="yes">_OK</property>
+                    <property name="use-underline">1</property>
+                    <signal name="clicked" handler="clicked_cb"/>
+                  </object>
+                </child>
               </object>
             </child>
             <layout>

demos/gtk-demo/assistant.c

@@ -94,7 +94,6 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
   gtk_container_add (GTK_CONTAINER (box), label);
@@ -116,12 +115,10 @@ create_page2 (GtkWidget *assistant)
 {
   GtkWidget *box, *checkbutton;
 
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
-  gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
   gtk_container_add (GTK_CONTAINER (box), checkbutton);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);

demos/gtk-demo/builder.c

@@ -38,22 +38,7 @@ help_activate (GSimpleAction *action,
   g_print ("Help not available\n");
 }
 
-static void
-not_implemented (GSimpleAction *action,
-                 GVariant      *parameter,
-                 gpointer       user_data)
-{
-  g_print ("Action “%s” not implemented\n", g_action_get_name (G_ACTION (action)));
-}
-
 static GActionEntry win_entries[] = {
-  { "new", not_implemented, NULL, NULL, NULL },
-  { "open", not_implemented, NULL, NULL, NULL },
-  { "save", not_implemented, NULL, NULL, NULL },
-  { "save-as", not_implemented, NULL, NULL, NULL },
-  { "copy", not_implemented, NULL, NULL, NULL },
-  { "cut", not_implemented, NULL, NULL, NULL },
-  { "paste", not_implemented, NULL, NULL, NULL },
   { "quit", quit_activate, NULL, NULL, NULL },
   { "about", about_activate, NULL, NULL, NULL },
   { "help", help_activate, NULL, NULL, NULL }
@@ -65,6 +50,8 @@ do_builder (GtkWidget *do_widget)
   static GtkWidget *window = NULL;
   GtkWidget *toolbar;
   GActionGroup *actions;
+  GtkAccelGroup *accel_group;
+  GtkWidget *item;
 
   if (!window)
     {
@@ -72,6 +59,7 @@ do_builder (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/builder/demo.ui");
 
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -85,6 +73,44 @@ do_builder (GtkWidget *do_widget)
                                        win_entries, G_N_ELEMENTS (win_entries),
                                        window);
       gtk_widget_insert_action_group (window, "win", actions);
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "new_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "open_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "save_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "quit_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "copy_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_c, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "cut_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "paste_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "help_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F1, 0, GTK_ACCEL_VISIBLE);
+
+      item = (GtkWidget*)gtk_builder_get_object (builder, "about_item");
+      gtk_widget_add_accelerator (item, "activate", accel_group,
+                                  GDK_KEY_F7, 0, GTK_ACCEL_VISIBLE);
 
       g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
     }

demos/gtk-demo/changedisplay.c

@@ -0,0 +1,551 @@
+/* Change Display
+ *
+ * Demonstrates migrating a window between different displays.
+ * A display is a mouse and keyboard with some number of
+ * associated monitors. The neat thing about having multiple
+ * displays is that they can be on a completely separate
+ * computers, as long as there is a network connection to the
+ * computer where the application is running.
+ *
+ * Only some of the windowing systems where GTK runs have the
+ * concept of multiple displays. (The X Window System is the
+ * main example.) Other windowing systems can only handle one
+ * keyboard and mouse, and combine all monitors into
+ * a single display.
+ *
+ * This is a moderately complex example, and demonstrates:
+ *
+ *  - Tracking the currently open displays
+ *
+ *  - Changing the display for a window
+ *
+ *  - Letting the user choose a window by clicking on it
+ *
+ *  - Using GtkListStore and GtkTreeView
+ *
+ *  - Using GtkDialog
+ */
+#include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+/* The ChangeDisplayInfo structure corresponds to a toplevel window and
+ * holds pointers to widgets inside the toplevel window along with other
+ * information about the contents of the window.
+ * This is a common organizational structure in real applications.
+ */
+typedef struct _ChangeDisplayInfo ChangeDisplayInfo;
+
+struct _ChangeDisplayInfo
+{
+  GtkWidget *window;
+  GtkSizeGroup *size_group;
+
+  GtkTreeModel *display_model;
+
+  GdkDisplay *current_display;
+};
+
+/* These enumerations provide symbolic names for the columns
+ * in the two GtkListStore models.
+ */
+enum
+{
+  DISPLAY_COLUMN_NAME,
+  DISPLAY_COLUMN_DISPLAY,
+  DISPLAY_NUM_COLUMNS
+};
+
+enum
+{
+  SCREEN_COLUMN_NUMBER,
+  SCREEN_COLUMN_SCREEN,
+  SCREEN_NUM_COLUMNS
+};
+
+/* Finds the toplevel window under the mouse pointer, if any.
+ */
+static GtkWidget *
+find_toplevel_at_pointer (GdkDisplay *display)
+{
+  GdkSurface *pointer_window;
+  GtkWidget *widget = NULL;
+
+  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
+
+  if (pointer_window)
+    widget = GTK_WIDGET (gtk_native_get_for_surface (pointer_window));
+
+  return widget;
+}
+
+static void
+released_cb (GtkGestureClick *gesture,
+             guint            n_press,
+             gdouble          x,
+             gdouble          y,
+             gboolean        *clicked)
+{
+  *clicked = TRUE;
+}
+
+/* Asks the user to click on a window, then waits for them click
+ * the mouse. When the mouse is released, returns the toplevel
+ * window under the pointer, or NULL, if there is none.
+ */
+static GtkWidget *
+query_for_toplevel (GdkDisplay *display,
+                    const char *prompt)
+{
+  GtkWidget *popup, *label, *frame;
+  GdkCursor *cursor;
+  GtkWidget *toplevel = NULL;
+  GdkDevice *device;
+
+  popup = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_display (GTK_WINDOW (popup), display);
+  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
+
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+  gtk_container_add (GTK_CONTAINER (popup), frame);
+
+  label = gtk_label_new (prompt);
+  g_object_set (label, "margin", 10, NULL);
+  gtk_container_add (GTK_CONTAINER (frame), label);
+
+  gtk_widget_show (popup);
+  cursor = gdk_cursor_new_from_name ("crosshair", NULL);
+  device = gtk_get_current_event_device ();
+
+  if (gdk_seat_grab (gdk_device_get_seat (device),
+                     gtk_native_get_surface (GTK_NATIVE (popup)),
+                     GDK_SEAT_CAPABILITY_ALL_POINTING,
+                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
+    {
+      GtkGesture *gesture = gtk_gesture_click_new ();
+      gboolean clicked = FALSE;
+
+      g_signal_connect (gesture, "released",
+                        G_CALLBACK (released_cb), &clicked);
+      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
+
+      /* Process events until clicked is set by our button release event handler.
+       * We pass in may_block=TRUE since we want to wait if there
+       * are no events currently.
+       */
+      while (!clicked)
+        g_main_context_iteration (NULL, TRUE);
+
+      gdk_seat_ungrab (gdk_device_get_seat (device));
+
+      toplevel = find_toplevel_at_pointer (display);
+      if (toplevel == popup)
+        toplevel = NULL;
+    }
+
+  g_object_unref (cursor);
+  gtk_widget_destroy (popup);
+
+  return toplevel;
+}
+
+/* Prompts the user for a toplevel window to move, and then moves
+ * that window to the currently selected display
+ */
+static void
+query_change_display (ChangeDisplayInfo *info)
+{
+  GdkDisplay *display = gtk_widget_get_display (info->window);
+  GtkWidget *toplevel;
+
+  toplevel = query_for_toplevel (display,
+                                 "Please select the toplevel\n"
+                                 "to move to the new display");
+
+  if (toplevel)
+    gtk_window_set_display (GTK_WINDOW (toplevel), info->current_display);
+  else
+    gdk_display_beep (display);
+}
+
+/* Called when the user clicks on a button in our dialog or
+ * closes the dialog through the window manager. Unless the
+ * "Change" button was clicked, we destroy the dialog.
+ */
+static void
+response_cb (GtkDialog         *dialog,
+             gint               response_id,
+             ChangeDisplayInfo *info)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    query_change_display (info);
+  else
+    gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+/* Called when the user clicks on "Open..." in the display
+ * frame. Prompts for a new display, and then opens a connection
+ * to that display.
+ */
+static void
+open_display_cb (GtkWidget         *button,
+                 ChangeDisplayInfo *info)
+{
+  GtkWidget *content_area;
+  GtkWidget *dialog;
+  GtkWidget *display_entry;
+  GtkWidget *dialog_label;
+  gchar *new_screen_name = NULL;
+  GdkDisplay *result = NULL;
+
+  dialog = gtk_dialog_new_with_buttons ("Open Display",
+                                        GTK_WINDOW (info->window),
+                                        GTK_DIALOG_MODAL,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_OK"), GTK_RESPONSE_OK,
+                                        NULL);
+
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  display_entry = gtk_entry_new ();
+  gtk_entry_set_activates_default (GTK_ENTRY (display_entry), TRUE);
+  dialog_label =
+    gtk_label_new ("Please enter the name of\nthe new display\n");
+
+  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
+  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
+  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
+
+  gtk_widget_grab_focus (display_entry);
+
+  while (!result)
+    {
+      gint response_id = gtk_dialog_run (GTK_DIALOG (dialog));
+      if (response_id != GTK_RESPONSE_OK)
+        break;
+
+      new_screen_name = gtk_editable_get_chars (GTK_EDITABLE (display_entry),
+                                                0, -1);
+
+      if (strcmp (new_screen_name, "") != 0)
+        {
+          result = gdk_display_open (new_screen_name);
+          if (!result)
+            {
+              gchar *error_msg =
+                g_strdup_printf  ("Can't open display:\n\t%s\nplease try another one\n",
+                                  new_screen_name);
+              gtk_label_set_text (GTK_LABEL (dialog_label), error_msg);
+              g_free (error_msg);
+            }
+
+          g_free (new_screen_name);
+        }
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+/* Called when the user clicks on the "Close" button in the
+ * "Display" frame. Closes the selected display.
+ */
+static void
+close_display_cb (GtkWidget         *button,
+                  ChangeDisplayInfo *info)
+{
+  if (info->current_display)
+    gdk_display_close (info->current_display);
+}
+
+/* Called when the selected row in the display list changes.
+ * Updates info->current_display, then refills the list of
+ * screens.
+ */
+static void
+display_changed_cb (GtkTreeSelection  *selection,
+                    ChangeDisplayInfo *info)
+{
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    gtk_tree_model_get (model, &iter,
+                        DISPLAY_COLUMN_DISPLAY, &info->current_display,
+                        -1);
+  else
+    info->current_display = NULL;
+}
+
+/* This function is used both for creating the "Display" and
+ * "Screen" frames, since they have a similar structure. The
+ * caller hooks up the right context for the value returned
+ * in tree_view, and packs any relevant buttons into button_vbox.
+ */
+static void
+create_frame (ChangeDisplayInfo *info,
+              const char        *title,
+              GtkWidget        **frame,
+              GtkWidget        **tree_view,
+              GtkWidget        **button_vbox)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *scrollwin;
+  GtkWidget *hbox;
+
+  *frame = gtk_frame_new (title);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+  g_object_set (hbox, "margin", 8, NULL);
+  gtk_container_add (GTK_CONTAINER (*frame), hbox);
+
+  scrollwin = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin),
+                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
+                                       GTK_SHADOW_IN);
+  gtk_container_add (GTK_CONTAINER (hbox), scrollwin);
+
+  *tree_view = gtk_tree_view_new ();
+  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
+  gtk_container_add (GTK_CONTAINER (scrollwin), *tree_view);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (*tree_view));
+  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+
+  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+  gtk_container_add (GTK_CONTAINER (hbox), *button_vbox);
+
+  if (!info->size_group)
+    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
+  gtk_size_group_add_widget (GTK_SIZE_GROUP (info->size_group), *button_vbox);
+}
+
+/* If we have a stack of buttons, it often looks better if their contents
+ * are left-aligned, rather than centered. This function creates a button
+ * and left-aligns it contents.
+ */
+GtkWidget *
+left_align_button_new (const char *label)
+{
+  GtkWidget *button = gtk_button_new_with_mnemonic (label);
+  GtkWidget *child = gtk_bin_get_child (GTK_BIN (button));
+
+  gtk_widget_set_halign (child, GTK_ALIGN_START);
+  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
+
+  return button;
+}
+
+/* Creates the "Display" frame in the main window.
+ */
+GtkWidget *
+create_display_frame (ChangeDisplayInfo *info)
+{
+  GtkWidget *frame;
+  GtkWidget *tree_view;
+  GtkWidget *button_vbox;
+  GtkTreeViewColumn *column;
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  create_frame (info, "Display", &frame, &tree_view, &button_vbox);
+
+  button = left_align_button_new ("_Open...");
+  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+
+  button = left_align_button_new ("_Close");
+  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
+  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+
+  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
+                                                            G_TYPE_STRING,
+                                                            GDK_TYPE_DISPLAY);
+
+  gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), info->display_model);
+
+  column = gtk_tree_view_column_new_with_attributes ("Name",
+                                                     gtk_cell_renderer_text_new (),
+                                                     "text", DISPLAY_COLUMN_NAME,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+  g_signal_connect (selection, "changed",
+                    G_CALLBACK (display_changed_cb), info);
+
+  return frame;
+}
+
+/* Called when one of the currently open displays is closed.
+ * Remove it from our list of displays.
+ */
+static void
+display_closed_cb (GdkDisplay        *display,
+                   gboolean           is_error,
+                   ChangeDisplayInfo *info)
+{
+  GtkTreeIter iter;
+  gboolean valid;
+
+  for (valid = gtk_tree_model_get_iter_first (info->display_model, &iter);
+       valid;
+       valid = gtk_tree_model_iter_next (info->display_model, &iter))
+    {
+      GdkDisplay *tmp_display;
+
+      gtk_tree_model_get (info->display_model, &iter,
+                          DISPLAY_COLUMN_DISPLAY, &tmp_display,
+                          -1);
+      if (tmp_display == display)
+        {
+          gtk_list_store_remove (GTK_LIST_STORE (info->display_model), &iter);
+          break;
+        }
+    }
+}
+
+/* Adds a new display to our list of displays, and connects
+ * to the "closed" signal so that we can remove it from the
+ * list of displays again.
+ */
+static void
+add_display (ChangeDisplayInfo *info,
+             GdkDisplay        *display)
+{
+  const gchar *name = gdk_display_get_name (display);
+  GtkTreeIter iter;
+
+  gtk_list_store_append (GTK_LIST_STORE (info->display_model), &iter);
+  gtk_list_store_set (GTK_LIST_STORE (info->display_model), &iter,
+                      DISPLAY_COLUMN_NAME, name,
+                      DISPLAY_COLUMN_DISPLAY, display,
+                      -1);
+
+  g_signal_connect (display, "closed",
+                    G_CALLBACK (display_closed_cb), info);
+}
+
+/* Called when a new display is opened
+ */
+static void
+display_opened_cb (GdkDisplayManager *manager,
+                   GdkDisplay        *display,
+                   ChangeDisplayInfo *info)
+{
+  add_display (info, display);
+}
+
+/* Adds all currently open displays to our list of displays,
+ * and set up a signal connection so that we'll be notified
+ * when displays are opened in the future as well.
+ */
+static void
+initialize_displays (ChangeDisplayInfo *info)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+  GSList *displays = gdk_display_manager_list_displays (manager);
+  GSList *tmp_list;
+
+  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
+    add_display (info, tmp_list->data);
+
+  g_slist_free (tmp_list);
+
+  g_signal_connect (manager, "display-opened",
+                    G_CALLBACK (display_opened_cb), info);
+}
+
+/* Cleans up when the toplevel is destroyed; we remove the
+ * connections we use to track currently open displays, then
+ * free the ChangeDisplayInfo structure.
+ */
+static void
+destroy_info (ChangeDisplayInfo *info)
+{
+  GdkDisplayManager *manager = gdk_display_manager_get ();
+  GSList *displays = gdk_display_manager_list_displays (manager);
+  GSList *tmp_list;
+
+  g_signal_handlers_disconnect_by_func (manager,
+                                        display_opened_cb,
+                                        info);
+
+  for (tmp_list = displays; tmp_list; tmp_list = tmp_list->next)
+    g_signal_handlers_disconnect_by_func (tmp_list->data,
+                                          display_closed_cb,
+                                          info);
+
+  g_slist_free (tmp_list);
+
+  g_object_unref (info->size_group);
+  g_object_unref (info->display_model);
+
+  if (info->current_display)
+    g_object_unref (info->current_display);
+
+  g_free (info);
+}
+
+static void
+destroy_cb (GObject            *object,
+            ChangeDisplayInfo **info)
+{
+  destroy_info (*info);
+  *info = NULL;
+}
+
+/* Main entry point. If the dialog for this demo doesn't yet exist, creates
+ * it. Otherwise, destroys it.
+ */
+GtkWidget *
+do_changedisplay (GtkWidget *do_widget)
+{
+  static ChangeDisplayInfo *info = NULL;
+
+  if (!info)
+    {
+      GtkWidget *content_area;
+      GtkWidget *vbox;
+      GtkWidget *frame;
+
+      info = g_new0 (ChangeDisplayInfo, 1);
+
+      info->window = gtk_dialog_new_with_buttons ("Change Display",
+                                                  GTK_WINDOW (do_widget),
+                                                  0,
+                                                  "Close", GTK_RESPONSE_CLOSE,
+                                                  "Change", GTK_RESPONSE_OK,
+                                                  NULL);
+
+      gtk_window_set_default_size (GTK_WINDOW (info->window), 300, 400);
+
+      g_signal_connect (info->window, "response",
+                        G_CALLBACK (response_cb), info);
+      g_signal_connect (info->window, "destroy",
+                        G_CALLBACK (destroy_cb), &info);
+
+      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
+
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+      g_object_set (vbox, "margin", 8, NULL);
+      gtk_container_add (GTK_CONTAINER (content_area), vbox);
+
+      frame = create_display_frame (info);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+      initialize_displays (info);
+
+      gtk_widget_show (info->window);
+      return info->window;
+    }
+  else
+    {
+      gtk_widget_destroy (info->window);
+      return NULL;
+    }
+}

demos/gtk-demo/clipboard.c

@@ -110,7 +110,7 @@ get_image_paintable (GtkImage *image)
       icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
       if (icon_info == NULL)
         return NULL;
-      return gtk_icon_info_load_icon (icon_info, NULL);
+      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));
@@ -164,19 +164,17 @@ drag_data_received (GtkWidget        *widget,
 }
 
 static void
-copy_image (GSimpleAction *action,
-            GVariant      *value,
-            gpointer       data)
+copy_image (GtkMenuItem *item,
+            gpointer     data)
 {
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
+  GdkClipboard *clipboard;
+  GdkPaintable *paintable;
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  paintable = get_image_paintable (GTK_IMAGE (data));
 
-  g_print ("copy image\n");
   if (GDK_IS_TEXTURE (paintable))
-    {
-g_print ("set clipboard\n");
-      gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-    }
+    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
 
   if (paintable)
     g_object_unref (paintable);
@@ -198,12 +196,16 @@ paste_image_received (GObject      *source,
 }
 
 static void
-paste_image (GSimpleAction *action,
-             GVariant      *value,
-             gpointer       data)
+paste_image (GtkMenuItem *item,
+             gpointer     data)
 {
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard, NULL, paste_image_received, data);
+  GdkClipboard *clipboard;
+
+  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  gdk_clipboard_read_texture_async (clipboard,
+                                    NULL,
+                                    paste_image_received,
+                                    data);
 }
 
 static void
@@ -213,23 +215,22 @@ pressed_cb (GtkGesture *gesture,
             double      y,
             GtkWidget  *image)
 {
-  GtkWidget *popover;
-  GMenu *menu;
-  GMenuItem *item;
+  GtkWidget *menu;
+  GtkWidget *item;
 
-  menu = g_menu_new (); 
-  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
-  g_menu_append_item (menu, item);
+  menu = gtk_menu_new ();
 
-  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
-  g_menu_append_item (menu, item);
+  item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), image);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  popover = gtk_popover_menu_new_from_model (image, G_MENU_MODEL (menu));
+  item = gtk_menu_item_new_with_mnemonic (_("_Paste"));
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), image);
+  gtk_widget_show (item);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &(GdkRectangle) { x, y, 1, 1});
-  gtk_popover_popup (GTK_POPOVER (popover));
-
-  g_object_unref (menu);
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
 }
 
 GtkWidget *
@@ -242,11 +243,6 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *entry, *button;
       GtkWidget *image;
       GtkGesture *gesture;
-      GActionEntry entries[] = {
-        { "copy", copy_image, NULL, NULL, NULL },
-        { "paste", paste_image, NULL, NULL, NULL },
-      };
-      GActionGroup *actions;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -328,13 +324,6 @@ do_clipboard (GtkWidget *do_widget)
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
 
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
-
       /* Create the second image */
       image = gtk_image_new_from_icon_name ("process-stop");
       gtk_container_add (GTK_CONTAINER (hbox), image);
@@ -359,13 +348,6 @@ do_clipboard (GtkWidget *do_widget)
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/cursors.c

@@ -24,6 +24,7 @@ do_cursors (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/demo.gresource.xml

@@ -104,9 +104,6 @@
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
   </gresource>
-  <gresource prefix="/iconscroll">
-    <file>iconscroll.ui</file>
-  </gresource>
   <gresource prefix="/iconview">
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
@@ -149,6 +146,7 @@
     <file>application_demo.c</file>
     <file>assistant.c</file>
     <file>builder.c</file>
+    <file>changedisplay.c</file>
     <file>clipboard.c</file>
     <file>colorsel.c</file>
     <file>combobox.c</file>
@@ -166,8 +164,8 @@
     <file>drawingarea.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
+    <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
-    <file>entry_undo.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
@@ -181,7 +179,6 @@
     <file>glarea.c</file>
     <file>headerbar.c</file>
     <file>hypertext.c</file>
-    <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
     <file>images.c</file>
@@ -190,6 +187,7 @@
     <file>listbox.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
+    <file>menus.c</file>
     <file>modelbutton.c</file>
     <file>overlay.c</file>
     <file>overlay2.c</file>
@@ -218,7 +216,6 @@
     <file>spinner.c</file>
     <file>tabs.c</file>
     <file>tagged_entry.c</file>
-    <file>textundo.c</file>
     <file>textview.c</file>
     <file>textscroll.c</file>
     <file>theming_style_classes.c</file>

demos/gtk-demo/demo.ui

@@ -22,75 +22,6 @@
       </row>
     </data>
   </object>
-  <menu id="menubar">
-    <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_New</attribute>
-          <attribute name="action">win.new</attribute>
-          <attribute name="accel">&lt;Primary&gt;n</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Open</attribute>
-          <attribute name="action">win.open</attribute>
-          <attribute name="accel">&lt;Primary&gt;o</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Save</attribute>
-          <attribute name="action">win.save</attribute>
-          <attribute name="accel">&lt;Primary&gt;s</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save _As</attribute>
-          <attribute name="action">win.save-as</attribute>
-          <attribute name="accel">&lt;Primary&gt;q</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Quit</attribute>
-          <attribute name="action">win.quit</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Edit</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Copy</attribute>
-          <attribute name="action">win.copy</attribute>
-          <attribute name="accel">&lt;Primary&gt;c</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Cut</attribute>
-          <attribute name="action">win.cut</attribute>
-          <attribute name="accel">&lt;Primary&gt;x</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Paste</attribute>
-          <attribute name="action">win.paste</attribute>
-          <attribute name="accel">&lt;Primary&gt;v</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Help</attribute>
-          <attribute name="action">win.help</attribute>
-          <attribute name="accel">F1</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_About</attribute>
-          <attribute name="action">win.about</attribute>
-          <attribute name="accel">F7</attribute>
-        </item>
-      </section>
-    </submenu>
-  </menu>
   <object class="GtkAboutDialog" id="aboutdialog1">
     <property name="program-name" translatable="yes">Builder demo</property>
     <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
@@ -106,8 +37,109 @@
       <object class="GtkBox" id="vbox1">
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkPopoverMenuBar" id="menubar1">
-            <property name="menu-model">menubar</property>
+          <object class="GtkMenuBar" id="menubar1">
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-menubar">
+                <property name="AtkObject::accessible-name">The menubar</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_File</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="new_item">
+                        <property name="label" translatable="yes">_New</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="open_item">
+                        <property name="label" translatable="yes">_Open</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_item">
+                        <property name="label" translatable="yes">_Save</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="save_as_item">
+                        <property name="label" translatable="yes">Save _As</property>
+                        <property name="use-underline">1</property>
+                        <accelerator key="s" modifiers="primary | shift-mask" signal="activate"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkSeparatorMenuItem"/>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="quit_item">
+                        <property name="label" translatable="yes">_Quit</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.quit</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="copy_item">
+                        <property name="label" translatable="yes">_Copy</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="cut_item">
+                        <property name="label" translatable="yes">_Cut</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="paste_item">
+                        <property name="label" translatable="yes">_Paste</property>
+                        <property name="use-underline">1</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use-underline">1</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <child>
+                      <object class="GtkMenuItem" id="help_item">
+                        <property name="label" translatable="yes">_Help</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.help</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem" id="about_item">
+                        <property name="label" translatable="yes">_About</property>
+                        <property name="use-underline">1</property>
+                        <property name="action-name">win.about</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
         </child>
         <child>

demos/gtk-demo/demotaggedentry.c

@@ -129,13 +129,13 @@ demo_tagged_entry_size_allocate (GtkWidget *widget,
                             baseline);
 }
 
-static gboolean
+static void
 demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
   DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  return gtk_widget_grab_focus (priv->entry);
+  gtk_widget_grab_focus (priv->entry);
 }
 
 static void

demos/gtk-demo/dnd.c

@@ -1,8 +1,6 @@
 /* Drag-and-Drop
  *
  * I can't believe its not glade!
- *
- * Try right-clicking in the window.
  */
 
 #include <glib/gi18n.h>
@@ -94,7 +92,7 @@ deserialize_widget (GtkDemoWidget *demo)
 static double pos_x, pos_y;
 
 static void
-new_label_cb (GtkWidget *button,
+new_label_cb (GtkMenuItem *item,
               gpointer     data)
 {
   GtkFixed *fixed = data;
@@ -102,12 +100,10 @@ new_label_cb (GtkWidget *button,
 
   widget = gtk_label_new ("Label");
   gtk_fixed_put (fixed, widget, pos_x, pos_y);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-new_spinner_cb (GtkWidget *button,
+new_spinner_cb (GtkMenuItem *item,
                 gpointer     data)
 {
   GtkFixed *fixed = data;
@@ -117,39 +113,33 @@ new_spinner_cb (GtkWidget *button,
   gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
   gtk_spinner_start (GTK_SPINNER (widget));
   gtk_fixed_put (fixed, widget, pos_x, pos_y);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-copy_cb (GtkWidget *button, GtkWidget *child)
+copy_cb (GtkWidget *child)
 {
   GdkClipboard *clipboard;
   GtkDemoWidget *demo;
 
+  g_print ("Copy %s\n", G_OBJECT_TYPE_NAME (child));
+
   demo = serialize_widget (child);
 
   clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
   gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-delete_cb (GtkWidget *button, GtkWidget *child)
+delete_cb (GtkWidget *child)
 {
   gtk_widget_destroy (child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
-cut_cb (GtkWidget *button, GtkWidget *child)
+cut_cb (GtkWidget *child)
 {
-  copy_cb (button, child);
-  delete_cb (button, child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+  copy_cb (child);
+  delete_cb (child);
 }
 
 static void
@@ -185,7 +175,7 @@ value_read (GObject      *source,
 }
 
 static void
-paste_cb (GtkWidget *button, GtkWidget *fixed)
+paste_cb (GtkWidget *fixed)
 {
   GdkClipboard *clipboard;
 
@@ -197,8 +187,6 @@ paste_cb (GtkWidget *button, GtkWidget *fixed)
     }
   else
     g_print ("Don't know how to handle clipboard contents\n");
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
@@ -217,7 +205,7 @@ edit_label_done (GtkWidget *entry, gpointer data)
 }
 
 static void
-edit_cb (GtkWidget *button, GtkWidget *child)
+edit_cb (GtkWidget *child)
 {
   GtkWidget *fixed = gtk_widget_get_parent (child);
   int x, y;
@@ -231,7 +219,6 @@ edit_cb (GtkWidget *button, GtkWidget *child)
       g_object_set_data (G_OBJECT (entry), "label", child);
 
       gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
-      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
       g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
       gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
       gtk_widget_grab_focus (entry);
@@ -243,9 +230,6 @@ edit_cb (GtkWidget *button, GtkWidget *child)
       g_object_get (child, "active", &active, NULL);
       g_object_set (child, "active", !active, NULL);
     }
-
-  if (button)
-    gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
@@ -263,65 +247,65 @@ pressed_cb (GtkGesture *gesture,
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
     {
+      GdkRectangle rect;
       GtkWidget *menu;
-      GtkWidget *box;
       GtkWidget *item;
       GdkClipboard *clipboard;
 
       pos_x = x;
       pos_y = y;
 
-      menu = gtk_popover_new (widget);
-      gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
-      gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (menu), box);
+      menu = gtk_menu_new ();
+      item = gtk_menu_item_new_with_label ("New Label");
+      g_signal_connect (item, "activate", G_CALLBACK (new_label_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("New Spinner");
+      g_signal_connect (item, "activate", G_CALLBACK (new_spinner_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_button_new_with_label ("New Label");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("New Spinner");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_separator_menu_item_new ();
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
-
-      item = gtk_button_new_with_label ("Edit");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      item = gtk_menu_item_new_with_label ("Edit");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (edit_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_separator_menu_item_new ();
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      item = gtk_button_new_with_label ("Cut");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      item = gtk_menu_item_new_with_label ("Cut");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Copy");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (cut_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Copy");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Paste");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (copy_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Paste");
       clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
       gtk_widget_set_sensitive (item,
                                 gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect (item, "clicked", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Delete");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (paste_cb), widget);
+      gtk_container_add (GTK_CONTAINER (menu), item);
+      item = gtk_menu_item_new_with_label ("Delete");
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      g_signal_connect_swapped (item, "activate", G_CALLBACK (delete_cb), child);
+      gtk_container_add (GTK_CONTAINER (menu), item);
 
-      gtk_popover_popup (GTK_POPOVER (menu));
+      rect.x = x;
+      rect.y = y;
+      rect.width = 0;
+      rect.height = 0;
+
+      gtk_menu_popup_at_rect (GTK_MENU (menu),
+                              gtk_native_get_surface (gtk_widget_get_native (widget)),
+                              &rect,
+                              GDK_GRAVITY_NORTH_WEST,
+                              GDK_GRAVITY_NORTH_WEST,
+                              NULL);
+
+      return;
     }
 }
 
@@ -341,7 +325,7 @@ released_cb (GtkGesture *gesture,
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
     {
       if (child != NULL && child != widget)
-        edit_cb (NULL, child);
+        edit_cb (child);
     }
 }
 

demos/gtk-demo/entry_buffer.c

@@ -1,29 +1,28 @@
-/* Entry/Entry Undo
+/* Entry/Entry Buffer
  *
- * GtkEntry can provide basic Undo/Redo support using standard keyboard
- * accelerators such as Primary+z to undo and Primary+Shift+z to redo.
- * Additionally, Primary+y can be used to redo.
- *
- * Use gtk_entry_set_enable_undo() to enable undo/redo support.
+ * GtkEntryBuffer provides the text content in a GtkEntry.
+ * Applications can provide their own buffer implementation,
+ * e.g. to provide secure handling for passwords in memory.
  */
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 GtkWidget *
-do_entry_undo (GtkWidget *do_widget)
+do_entry_buffer (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkEntryBuffer *buffer;
 
   if (!window)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Buffer");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
@@ -34,13 +33,22 @@ do_entry_undo (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
+                            "Entries share a buffer. Typing in one is reflected in the other.");
       gtk_container_add (GTK_CONTAINER (vbox), label);
 
-      /* Create our entry */
-      entry = gtk_entry_new ();
-      gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
+      /* Create a buffer */
+      buffer = gtk_entry_buffer_new (NULL, 0);
+
+      /* Create our first entry */
+      entry = gtk_entry_new_with_buffer (buffer);
       gtk_container_add (GTK_CONTAINER (vbox), entry);
+
+      /* Create the second entry */
+      entry = gtk_entry_new_with_buffer (buffer);
+      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
+
+      g_object_unref (buffer);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/expander.c

@@ -52,7 +52,7 @@ do_expander (GtkWidget *do_widget)
       area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
 
       label = gtk_widget_get_last_child (area);
-      gtk_label_set_wrap (GTK_LABEL (label), FALSE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
 
       expander = gtk_expander_new ("Details:");

demos/gtk-demo/filtermodel.c

@@ -122,6 +122,7 @@ do_filtermodel (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/fishbowl.c

@@ -124,7 +124,7 @@ create_label (void)
 {
   GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
 
-  gtk_label_set_wrap (GTK_LABEL (w), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
   gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
 
   return w;
@@ -226,8 +226,8 @@ set_widget_type (GtkFishbowl *fishbowl,
 }
 
 void
-fishbowl_next_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+next_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -241,8 +241,8 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_prev_button_clicked_cb (GtkButton *source,
-                                 gpointer   user_data)
+prev_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
 {
   GtkFishbowl *fishbowl = user_data;
   int new_index;
@@ -256,8 +256,8 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
 }
 
 void
-fishbowl_changes_toggled_cb (GtkToggleButton *button,
-                             gpointer         user_data)
+changes_toggled_cb (GtkToggleButton *button,
+                    gpointer         user_data)
 {
   if (gtk_toggle_button_get_active (button))
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-prevent");
@@ -288,6 +288,12 @@ do_fishbowl (GtkWidget *do_widget)
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
+                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
+                                        "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

demos/gtk-demo/fishbowl.ui

@@ -15,13 +15,13 @@
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
             <child>
               <object class="GtkButton">
                 <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
+                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
               </object>
             </child>
           </object>
@@ -50,7 +50,7 @@
           <object class="GtkToggleButton" id="changes_allow">
             <property name="icon-name">changes-allow</property>
             <property name="relief">none</property>
-            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
+            <signal name="notify::active" handler="changes_toggled_cb"/>
           </object>
         </child>
       </object>

demos/gtk-demo/font-features.ui

@@ -13,7 +13,7 @@
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
-            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+            <signal name="clicked" handler="reset" swapped="no"/>
             <child>
               <object class="GtkImage">
                 <property name="icon-name">view-refresh-symbolic</property>
@@ -42,7 +42,7 @@
                         <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
                         <property name="level">family|style|size|variations|features</property>
-                        <signal name="font-set" handler="font_features_font_changed" swapped="no"/>
+                        <signal name="font-set" handler="font_changed" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -63,7 +63,7 @@
                               <object class="GtkComboBox" id="script_lang">
                                 <property name="can-focus">1</property>
                                 <property name="margin-top">10</property>
-                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
+                                <signal name="changed" handler="script_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -137,7 +137,7 @@
 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
 
 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                        <signal name="activate" handler="font_features_stop_edit"/>
+                        <signal name="activate" handler="stop_edit"/>
                         <property name="valign">start</property>
                         <property name="width-chars">50</property>
                       </object>
@@ -181,7 +181,7 @@
                     <property name="icon-name">document-edit-symbolic</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
-                    <signal name="toggled" handler="font_features_toggle_edit"/>
+                    <signal name="toggled" handler="toggle_edit"/>
                   </object>
                 </child>
               </object>

demos/gtk-demo/font_features.c

@@ -15,6 +15,10 @@
 #include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
+#include <hb-ft.h>
+#include <freetype/ftmm.h>
+#include <freetype/ftsnames.h>
+#include <freetype/ttnameid.h>
 #include <glib/gi18n.h>
 
 #include "open-type-layout.h"
@@ -480,6 +484,7 @@ update_script_combo (void)
   GtkListStore *store;
   hb_font_t *hb_font;
   gint i, j, k;
+  FT_Face ft_face;
   PangoFont *pango_font;
   GHashTable *tags;
   GHashTableIter iter;
@@ -500,7 +505,8 @@ update_script_combo (void)
   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);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
+  hb_font = hb_ft_font_create (ft_face, NULL);
 
   tags = g_hash_table_new_full (tag_pair_hash, tag_pair_equal, g_free, NULL);
 
@@ -539,8 +545,11 @@ update_script_combo (void)
                 }
             }
         }
+
+      hb_face_destroy (hb_face);
     }
 
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
   g_object_unref (pango_font);
 
   g_hash_table_iter_init (&iter, tags);
@@ -598,6 +607,7 @@ update_features (void)
   GtkTreeIter iter;
   guint script_index, lang_index;
   PangoFont *pango_font;
+  FT_Face ft_face;
   hb_font_t *hb_font;
   GList *l;
 
@@ -622,7 +632,8 @@ update_features (void)
                       -1);
 
   pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
+  hb_font = hb_ft_font_create (ft_face, NULL);
 
   if (hb_font)
     {
@@ -704,8 +715,11 @@ update_features (void)
 
           g_free (feat);
         }
+
+      hb_face_destroy (hb_face);
     }
 
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
   g_object_unref (pango_font);
 }
 
@@ -786,29 +800,24 @@ axes_equal (gconstpointer v1, gconstpointer v2)
 }
 
 static void
-add_axis (hb_face_t             *hb_face,
-          hb_ot_var_axis_info_t *ax,
-          float                  value,
-          int                    i)
+add_axis (FT_Var_Axis *ax, FT_Fixed value, int i)
 {
   GtkWidget *axis_label;
   GtkWidget *axis_entry;
   GtkWidget *axis_scale;
   GtkAdjustment *adjustment;
   Axis *axis;
-  char name[20];
-  unsigned int name_len = 20;
 
-  hb_ot_name_get_utf8 (hb_face, ax->name_id, HB_LANGUAGE_INVALID, &name_len, name);
-
-  axis_label = gtk_label_new (name);
+  axis_label = gtk_label_new (ax->name);
   gtk_widget_set_halign (axis_label, GTK_ALIGN_START);
   gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE);
   gtk_grid_attach (GTK_GRID (variations_grid), axis_label, 0, i, 1, 1);
-  adjustment = gtk_adjustment_new (value, ax->min_value, ax->max_value,
+  adjustment = gtk_adjustment_new ((double)FixedToFloat(value),
+                                   (double)FixedToFloat(ax->minimum),
+                                   (double)FixedToFloat(ax->maximum),
                                    1.0, 10.0, 0.0);
   axis_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
-  gtk_scale_add_mark (GTK_SCALE (axis_scale), ax->default_value, GTK_POS_TOP, NULL);
+  gtk_scale_add_mark (GTK_SCALE (axis_scale), (double)FixedToFloat(ax->def), GTK_POS_TOP, NULL);
   gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE);
   gtk_widget_set_hexpand (axis_scale, TRUE);
   gtk_widget_set_size_request (axis_scale, 100, -1);
@@ -833,7 +842,9 @@ add_axis (hb_face_t             *hb_face,
 
 typedef struct {
   char *name;
-  unsigned int index;
+  int n_axes;
+  guint32 *axes;
+  float   *coords;
 } Instance;
 
 static guint
@@ -859,32 +870,559 @@ free_instance (gpointer data)
   Instance *instance = data;
 
   g_free (instance->name);
+  g_free (instance->axes);
+  g_free (instance->coords);
   g_free (instance);
 }
 
 static GHashTable *instances;
 
+typedef struct {
+    const FT_UShort     platform_id;
+    const FT_UShort     encoding_id;
+    const char  fromcode[12];
+} FtEncoding;
+
+#define TT_ENCODING_DONT_CARE   0xffff
+
+static const FtEncoding   ftEncoding[] = {
+ {  TT_PLATFORM_APPLE_UNICODE,  TT_ENCODING_DONT_CARE,  "UTF-16BE" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_ID_ROMAN,        "MACINTOSH" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_ID_JAPANESE,     "SJIS" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_SYMBOL_CS,     "UTF-16BE" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_UNICODE_CS,    "UTF-16BE" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_SJIS,          "SJIS-WIN" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_GB2312,        "GB2312" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_BIG_5,         "BIG-5" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_WANSUNG,       "Wansung" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_JOHAB,         "Johab" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_ID_UCS_4,         "UTF-16BE" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_7BIT_ASCII,   "ASCII" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_10646,        "UTF-16BE" },
+ {  TT_PLATFORM_ISO,            TT_ISO_ID_8859_1,       "ISO-8859-1" },
+};
+
+typedef struct {
+    const FT_UShort     platform_id;
+    const FT_UShort     language_id;
+    const char  lang[8];
+} FtLanguage;
+
+#define TT_LANGUAGE_DONT_CARE   0xffff
+
+static const FtLanguage   ftLanguage[] = {
+ {  TT_PLATFORM_APPLE_UNICODE,  TT_LANGUAGE_DONT_CARE,              "" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ENGLISH,              "en" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FRENCH,               "fr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GERMAN,               "de" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ITALIAN,              "it" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DUTCH,                "nl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SWEDISH,              "sv" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SPANISH,              "es" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DANISH,               "da" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PORTUGUESE,           "pt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_NORWEGIAN,            "no" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HEBREW,               "he" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_JAPANESE,             "ja" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ARABIC,               "ar" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FINNISH,              "fi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREEK,                "el" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ICELANDIC,            "is" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALTESE,              "mt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TURKISH,              "tr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CROATIAN,             "hr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHINESE_TRADITIONAL,  "zh-tw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_URDU,                 "ur" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HINDI,                "hi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_THAI,                 "th" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KOREAN,               "ko" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LITHUANIAN,           "lt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_POLISH,               "pl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_HUNGARIAN,            "hu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ESTONIAN,             "et" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LETTISH,              "lv" },
+/* {  TT_PLATFORM_MACINTOSH,    TT_MAC_LANGID_SAAMISK, ??? */
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FAEROESE,             "fo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FARSI,                "fa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUSSIAN,              "ru" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHINESE_SIMPLIFIED,   "zh-cn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_FLEMISH,              "nl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH,                "ga" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ALBANIAN,             "sq" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ROMANIAN,             "ro" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CZECH,                "cs" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SLOVAK,               "sk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SLOVENIAN,            "sl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_YIDDISH,              "yi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SERBIAN,              "sr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MACEDONIAN,           "mk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BULGARIAN,            "bg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UKRAINIAN,            "uk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BYELORUSSIAN,         "be" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UZBEK,                "uz" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KAZAKH,               "kk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI,          "az" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_CYRILLIC_SCRIPT, "az" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT,    "ar" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ARMENIAN,             "hy" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GEORGIAN,             "ka" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MOLDAVIAN,            "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KIRGHIZ,              "ky" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAJIKI,               "tg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TURKMEN,              "tk" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN,            "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN_MONGOLIAN_SCRIPT,"mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT, "mo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PASHTO,               "ps" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KURDISH,              "ku" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KASHMIRI,             "ks" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SINDHI,               "sd" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TIBETAN,              "bo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_NEPALI,               "ne" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SANSKRIT,             "sa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MARATHI,              "mr" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BENGALI,              "bn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ASSAMESE,             "as" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GUJARATI,             "gu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_PUNJABI,              "pa" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ORIYA,                "or" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAYALAM,            "ml" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KANNADA,              "kn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAMIL,                "ta" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TELUGU,               "te" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SINHALESE,            "si" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BURMESE,              "my" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_KHMER,                "km" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LAO,                  "lo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_VIETNAMESE,           "vi" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_INDONESIAN,           "id" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TAGALOG,              "tl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAY_ROMAN_SCRIPT,   "ms" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAY_ARABIC_SCRIPT,  "ms" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AMHARIC,              "am" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TIGRINYA,             "ti" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GALLA,                "om" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SOMALI,               "so" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SWAHILI,              "sw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUANDA,               "rw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_RUNDI,                "rn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CHEWA,                "ny" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MALAGASY,             "mg" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_ESPERANTO,            "eo" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_WELSH,                "cy" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BASQUE,               "eu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_CATALAN,              "ca" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_LATIN,                "la" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_QUECHUA,              "qu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GUARANI,              "gn" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AYMARA,               "ay" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TATAR,                "tt" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_UIGHUR,               "ug" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_DZONGKHA,             "dz" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_JAVANESE,             "jw" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SUNDANESE,            "su" },
+
+#if 0  /* these seem to be errors that have been dropped */
+
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SCOTTISH_GAELIC },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH_GAELIC },
+
+#endif
+
+  /* The following codes are new as of 2000-03-10 */
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GALICIAN,             "gl" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AFRIKAANS,            "af" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_BRETON,               "br" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_INUKTITUT,            "iu" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_SCOTTISH_GAELIC,      "gd" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_MANX_GAELIC,          "gv" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_IRISH_GAELIC,         "ga" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_TONGAN,               "to" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREEK_POLYTONIC,      "el" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_GREELANDIC,           "ik" },
+ {  TT_PLATFORM_MACINTOSH,      TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT,"az" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_SAUDI_ARABIA,       "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_IRAQ,               "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_EGYPT,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_LIBYA,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_ALGERIA,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_MOROCCO,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_TUNISIA,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_OMAN,               "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_YEMEN,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_SYRIA,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_JORDAN,             "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_LEBANON,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_KUWAIT,             "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_UAE,                "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_BAHRAIN,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_QATAR,              "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BULGARIAN_BULGARIA,        "bg" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CATALAN_SPAIN,             "ca" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_TAIWAN,            "zh-tw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_PRC,               "zh-cn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_HONG_KONG,         "zh-hk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_SINGAPORE,         "zh-sg" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_MACAU,             "zh-mo" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CZECH_CZECH_REPUBLIC,      "cs" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DANISH_DENMARK,            "da" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_GERMANY,            "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_SWITZERLAND,        "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_AUSTRIA,            "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_LUXEMBOURG,         "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GERMAN_LIECHTENSTEI,       "de" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GREEK_GREECE,              "el" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_UNITED_STATES,     "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_UNITED_KINGDOM,    "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_AUSTRALIA,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_CANADA,            "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_NEW_ZEALAND,       "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_IRELAND,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_SOUTH_AFRICA,      "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_JAMAICA,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_CARIBBEAN,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_BELIZE,            "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_TRINIDAD,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_ZIMBABWE,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_PHILIPPINES,       "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_SPAIN_TRADITIONAL_SORT,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_MEXICO,            "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_SPAIN_INTERNATIONAL_SORT,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_GUATEMALA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_COSTA_RICA,        "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PANAMA,            "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_DOMINICAN_REPUBLIC,"es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_VENEZUELA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_COLOMBIA,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PERU,              "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_ARGENTINA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_ECUADOR,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_CHILE,             "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_URUGUAY,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PARAGUAY,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_BOLIVIA,           "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_EL_SALVADOR,       "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_HONDURAS,          "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_NICARAGUA,         "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_PUERTO_RICO,       "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FINNISH_FINLAND,           "fi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_FRANCE,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_BELGIUM,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CANADA,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_SWITZERLAND,        "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_LUXEMBOURG,         "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MONACO,             "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HEBREW_ISRAEL,             "he" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HUNGARIAN_HUNGARY,         "hu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ICELANDIC_ICELAND,         "is" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ITALIAN_ITALY,             "it" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ITALIAN_SWITZERLAND,       "it" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_JAPANESE_JAPAN,            "ja" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KOREAN_EXTENDED_WANSUNG_KOREA,"ko" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KOREAN_JOHAB_KOREA,        "ko" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DUTCH_NETHERLANDS,         "nl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DUTCH_BELGIUM,             "nl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NORWEGIAN_NORWAY_BOKMAL,   "no" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NORWEGIAN_NORWAY_NYNORSK,  "nn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_POLISH_POLAND,             "pl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PORTUGUESE_BRAZIL,         "pt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PORTUGUESE_PORTUGAL,       "pt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RHAETO_ROMANIC_SWITZERLAND,"rm" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ROMANIAN_ROMANIA,          "ro" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MOLDAVIAN_MOLDAVIA,        "mo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RUSSIAN_RUSSIA,            "ru" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_RUSSIAN_MOLDAVIA,          "ru" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CROATIAN_CROATIA,          "hr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SERBIAN_SERBIA_LATIN,      "sr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SERBIAN_SERBIA_CYRILLIC,   "sr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SLOVAK_SLOVAKIA,           "sk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ALBANIAN_ALBANIA,          "sq" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWEDISH_SWEDEN,            "sv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWEDISH_FINLAND,           "sv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_THAI_THAILAND,             "th" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TURKISH_TURKEY,            "tr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_URDU_PAKISTAN,             "ur" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_INDONESIAN_INDONESIA,      "id" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UKRAINIAN_UKRAINE,         "uk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BELARUSIAN_BELARUS,        "be" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SLOVENE_SLOVENIA,          "sl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ESTONIAN_ESTONIA,          "et" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LATVIAN_LATVIA,            "lv" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LITHUANIAN_LITHUANIA,      "lt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CLASSIC_LITHUANIAN_LITHUANIA,"lt" },
+
+#ifdef TT_MS_LANGID_MAORI_NEW_ZELAND
+    /* this seems to be an error that have been dropped */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MAORI_NEW_ZEALAND,         "mi" },
+#endif
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FARSI_IRAN,                "fa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_VIETNAMESE_VIET_NAM,       "vi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARMENIAN_ARMENIA,          "hy" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AZERI_AZERBAIJAN_LATIN,    "az" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AZERI_AZERBAIJAN_CYRILLIC, "az" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BASQUE_SPAIN,              "eu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SORBIAN_GERMANY,           "wen" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MACEDONIAN_MACEDONIA,      "mk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SUTU_SOUTH_AFRICA,         "st" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TSONGA_SOUTH_AFRICA,       "ts" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TSWANA_SOUTH_AFRICA,       "tn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_VENDA_SOUTH_AFRICA,        "ven" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_XHOSA_SOUTH_AFRICA,        "xh" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ZULU_SOUTH_AFRICA,         "zu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AFRIKAANS_SOUTH_AFRICA,    "af" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GEORGIAN_GEORGIA,          "ka" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FAEROESE_FAEROE_ISLANDS,   "fo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HINDI_INDIA,               "hi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALTESE_MALTA,             "mt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SAAMI_LAPONIA,             "se" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SCOTTISH_GAELIC_UNITED_KINGDOM,"gd" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IRISH_GAELIC_IRELAND,      "ga" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAY_MALAYSIA,            "ms" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAY_BRUNEI_DARUSSALAM,   "ms" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KAZAK_KAZAKSTAN,           "kk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SWAHILI_KENYA,             "sw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UZBEK_UZBEKISTAN_LATIN,    "uz" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_UZBEK_UZBEKISTAN_CYRILLIC, "uz" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TATAR_TATARSTAN,           "tt" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BENGALI_INDIA,             "bn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PUNJABI_INDIA,             "pa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GUJARATI_INDIA,            "gu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ORIYA_INDIA,               "or" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMIL_INDIA,               "ta" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TELUGU_INDIA,              "te" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KANNADA_INDIA,             "kn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MALAYALAM_INDIA,           "ml" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ASSAMESE_INDIA,            "as" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MARATHI_INDIA,             "mr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SANSKRIT_INDIA,            "sa" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KONKANI_INDIA,             "kok" },
+
+  /* new as of 2001-01-01 */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ARABIC_GENERAL,            "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHINESE_GENERAL,           "zh" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_GENERAL,           "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_WEST_INDIES,        "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_REUNION,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CONGO,              "fr" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_SENEGAL,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_CAMEROON,           "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_COTE_D_IVOIRE,      "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MALI,               "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BOSNIAN_BOSNIA_HERZEGOVINA,"bs" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_URDU_INDIA,                "ur" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAJIK_TAJIKISTAN,          "tg" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YIDDISH_GERMANY,           "yi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KIRGHIZ_KIRGHIZSTAN,       "ky" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TURKMEN_TURKMENISTAN,      "tk" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MONGOLIAN_MONGOLIA,        "mn" },
+
+  /* the following seems to be inconsistent;
+     here is the current "official" way: */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIBETAN_BHUTAN,            "bo" },
+  /* and here is what is used by Passport SDK */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIBETAN_CHINA,             "bo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DZONGHKA_BHUTAN,           "dz" },
+  /* end of inconsistency */
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_WELSH_WALES,               "cy" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KHMER_CAMBODIA,            "km" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LAO_LAOS,                  "lo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BURMESE_MYANMAR,           "my" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GALICIAN_SPAIN,            "gl" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MANIPURI_INDIA,            "mni" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SINDHI_INDIA,              "sd" },
+  /* the following one is only encountered in Microsoft RTF specification */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KASHMIRI_PAKISTAN,         "ks" },
+  /* the following one is not in the Passport list, looks like an omission */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KASHMIRI_INDIA,            "ks" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NEPALI_NEPAL,              "ne" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_NEPALI_INDIA,              "ne" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRISIAN_NETHERLANDS,       "fy" },
+
+  /* new as of 2001-03-01 (from Office Xp) */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_HONG_KONG,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_INDIA,             "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_MALAYSIA,          "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_ENGLISH_SINGAPORE,         "en" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SYRIAC_SYRIA,              "syr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SINHALESE_SRI_LANKA,       "si" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_CHEROKEE_UNITED_STATES,    "chr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_INUKTITUT_CANADA,          "iu" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_AMHARIC_ETHIOPIA,          "am" },
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMAZIGHT_MOROCCO },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TAMAZIGHT_MOROCCO_LATIN },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PASHTO_AFGHANISTAN,        "ps" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FILIPINO_PHILIPPINES,      "phi" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_DHIVEHI_MALDIVES,          "div" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_OROMO_ETHIOPIA,            "om" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIGRIGNA_ETHIOPIA,         "ti" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_TIGRIGNA_ERYTHREA,         "ti" },
+
+  /* New additions from Windows Xp/Passport SDK 2001-11-10. */
+
+  /* don't ask what this one means... It is commented out currently. */
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GREEK_GREECE2 },
+#endif
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_UNITED_STATES,     "es" },
+  /* The following two IDs blatantly violate MS specs by using a */
+  /* sublanguage >,.                                         */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SPANISH_LATIN_AMERICA,     "es" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_NORTH_AFRICA,       "fr" },
+
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_MOROCCO,            "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FRENCH_HAITI,              "fr" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_BENGALI_BANGLADESH,        "bn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PUNJABI_ARABIC_PAKISTAN,   "ar" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_MONGOLIAN_MONGOLIA_MONGOLIAN,"mn" },
+#if 0
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_EDO_NIGERIA },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_FULFULDE_NIGERIA },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IBIBIO_NIGERIA },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HAUSA_NIGERIA,             "ha" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YORUBA_NIGERIA,            "yo" },
+  /* language codes from, to, are (still) unknown. */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_IGBO_NIGERIA,              "ibo" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_KANURI_NIGERIA,            "kau" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_GUARANI_PARAGUAY,          "gn" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_HAWAIIAN_UNITED_STATES,    "haw" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_LATIN,                     "la" },
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_SOMALI_SOMALIA,            "so" },
+#if 0
+  /* Note: Yi does not have a (proper) ISO 639-2 code, since it is mostly */
+  /*       not written (but OTOH the peculiar writing system is worth     */
+  /*       studying).                                                     */
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_YI_CHINA },
+#endif
+ {  TT_PLATFORM_MICROSOFT,      TT_MS_LANGID_PAPIAMENTU_NETHERLANDS_ANTILLES,"pap" },
+};
+
+static const char *
+FcSfntNameLanguage (FT_SfntName *sname)
+{
+    int i;
+    FT_UShort platform_id = sname->platform_id;
+    FT_UShort language_id = sname->language_id;
+
+    for (i = 0; i < G_N_ELEMENTS (ftLanguage); i++)
+        if (ftLanguage[i].platform_id == platform_id &&
+            (ftLanguage[i].language_id == TT_LANGUAGE_DONT_CARE ||
+             ftLanguage[i].language_id == language_id))
+        {
+            if (ftLanguage[i].lang[0] == '\0')
+              return NULL;
+            else
+              return ftLanguage[i].lang;
+        }
+    return NULL;
+}
+
+static char *
+FcSfntNameTranscode (FT_SfntName *name)
+{
+    int        i;
+    const char *fromcode;
+
+    for (i = 0; i < G_N_ELEMENTS (ftEncoding); i++)
+        if (ftEncoding[i].platform_id == name->platform_id &&
+            (ftEncoding[i].encoding_id == TT_ENCODING_DONT_CARE ||
+             ftEncoding[i].encoding_id == name->encoding_id))
+            break;
+    if (i == G_N_ELEMENTS (ftEncoding))
+        return  NULL;
+    fromcode = ftEncoding[i].fromcode;
+
+    return g_convert ((const char *)name->string, name->string_len, "UTF-8", fromcode, NULL, NULL, NULL);
+}
+
+static char *
+get_sfnt_name (FT_Face ft_face,
+               guint   nameid)
+{
+  guint count;
+  guint i, j;
+  const char * const *langs = g_get_language_names ();
+  char *res = NULL;
+  guint pos = G_MAXUINT;
+
+  count = FT_Get_Sfnt_Name_Count (ft_face);
+  for (i = 0; i < count; i++)
+    {
+      FT_SfntName name;
+      const char *lang;
+
+      if (FT_Get_Sfnt_Name (ft_face, i, &name) != 0)
+        continue;
+
+      if (name.name_id != nameid)
+        continue;
+
+      lang = FcSfntNameLanguage (&name);
+      for (j = 0; j < pos && langs[j]; j++)
+        {
+          if (strcmp (lang, langs[j]) == 0)
+            {
+              pos = j;
+              g_free (res);
+              res = FcSfntNameTranscode (&name);
+            }
+        }
+
+      if (pos == 0)
+        break;
+    }
+
+  return res;
+}
+
+static gboolean
+is_valid_subfamily_id (guint id)
+{
+  return id == 2 || id == 17 || (255 < id && id < 32768);
+}
+
 static void
-add_instance (hb_face_t    *face,
-              unsigned int  index,
-              GtkWidget    *combo,
-              int           pos)
+add_instance (FT_Face             ft_face,
+              FT_MM_Var          *ft_mm_var,
+              FT_Var_Named_Style *ns,
+              GtkWidget          *combo,
+              int                 pos)
 {
   Instance *instance;
-  hb_ot_name_id_t name_id;
-  char name[20];
-  unsigned int name_len = 20;
+  int i;
 
   instance = g_new0 (Instance, 1);
 
-  name_id = hb_ot_var_named_instance_get_subfamily_name_id (face, index);
-  hb_ot_name_get_utf8 (face, name_id, HB_LANGUAGE_INVALID, &name_len, name);
-
-  instance->name = g_strdup (name);
-  instance->index = index;
+  if (is_valid_subfamily_id (ns->strid))
+    instance->name = get_sfnt_name (ft_face, ns->strid);
+  if (!instance->name)
+    instance->name = g_strdup_printf ("Instance %d", pos);
 
   g_hash_table_add (instances, instance);
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), instance->name);
+
+  instance->n_axes = ft_mm_var->num_axis;
+  instance->axes = g_new (guint32, ft_mm_var->num_axis);
+  instance->coords = g_new (float, ft_mm_var->num_axis);
+
+  for (i = 0; i < ft_mm_var->num_axis; i++)
+    {
+      instance->axes[i] = ft_mm_var->axis[i].tag;
+      instance->coords[i] = FixedToFloat(ns->coords[i]);
+    }
 }
 
 static void
@@ -901,13 +1439,6 @@ instance_changed (GtkComboBox *combo)
   Instance *instance;
   Instance ikey;
   int i;
-  unsigned int coords_length;
-  float *coords = NULL;
-  hb_ot_var_axis_info_t *ai = NULL;
-  unsigned int n_axes;
-  PangoFont *pango_font = NULL;
-  hb_font_t *hb_font;
-  hb_face_t *hb_face;
 
   text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo));
   if (text[0] == '\0')
@@ -921,29 +1452,17 @@ instance_changed (GtkComboBox *combo)
       goto out;
     }
 
-  pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
-  hb_face = hb_font_get_face (hb_font);
-
-  n_axes = hb_ot_var_get_axis_infos (hb_face, 0, NULL, NULL);
-  ai = g_new (hb_ot_var_axis_info_t, n_axes);
-  hb_ot_var_get_axis_infos (hb_face, 0, &n_axes, ai);
-
-  coords = g_new (float, n_axes);
-  hb_ot_var_named_instance_get_design_coords (hb_face,
-                                              instance->index,
-                                              &coords_length,
-                                              coords);
-
-  for (i = 0; i < n_axes; i++)
+  for (i = 0; i < instance->n_axes; i++)
     {
       Axis *axis;
       Axis akey;
+      guint32 tag;
       gdouble value;
 
-      value = coords[ai[i].axis_index];
+      tag = instance->axes[i];
+      value = instance->coords[i];
 
-      akey.tag = ai[i].tag;
+      akey.tag = tag;
       axis = g_hash_table_lookup (axes, &akey);
       if (axis)
         {
@@ -955,31 +1474,17 @@ instance_changed (GtkComboBox *combo)
 
 out:
   g_free (text);
-  g_clear_object (&pango_font);
-  g_free (ai);
-  g_free (coords);
 }
 
 static gboolean
-matches_instance (hb_face_t             *hb_face,
-                  unsigned int           index,
-                  unsigned int           n_axes,
-                  float                 *coords)
+matches_instance (FT_Var_Named_Style *instance,
+                  FT_Fixed           *coords,
+                  FT_UInt             num_coords)
 {
-  float *instance_coords;
-  unsigned int coords_length;
-  int i;
+  FT_UInt i;
 
-  instance_coords = g_new (float, n_axes);
-  coords_length = n_axes;
-
-  hb_ot_var_named_instance_get_design_coords (hb_face,
-                                              index,
-                                              &coords_length,
-                                              instance_coords);
-
-  for (i = 0; i < n_axes; i++)
-    if (instance_coords[i] != coords[i])
+  for (i = 0; i < num_coords; i++)
+    if (coords[i] != instance->coords[i])
       return FALSE;
 
   return TRUE;
@@ -1010,31 +1515,14 @@ add_font_plane (int i)
     }
 }
 
-/* FIXME: This doesn't work if the font has an avar table */
-static float
-denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
-{
-  float r = coord / 16384.0;
-
-  if (coord < 0)
-    return axis->default_value + r * (axis->default_value - axis->min_value);
-  else
-    return axis->default_value + r * (axis->max_value - axis->default_value);
-}
-
 static void
 update_font_variations (void)
 {
   GtkWidget *child, *next;
-  PangoFont *pango_font = NULL;
-  hb_font_t *hb_font;
-  hb_face_t *hb_face;
-  unsigned int n_axes;
-  hb_ot_var_axis_info_t *ai = NULL;
-  float *design_coords = NULL;
-  const int *coords;
-  unsigned int length;
-  int i;
+  PangoFont *pango_font;
+  FT_Face ft_face;
+  FT_MM_Var *ft_mm_var;
+  FT_Error ret;
 
   child = gtk_widget_get_first_child (variations_grid);
   while (child != NULL)
@@ -1050,82 +1538,81 @@ update_font_variations (void)
   g_hash_table_remove_all (instances);
 
   pango_font = get_pango_font ();
-  hb_font = pango_font_get_hb_font (pango_font);
-  hb_face = hb_font_get_face (hb_font);
+  ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
 
-  n_axes = hb_ot_var_get_axis_infos (hb_face, 0, NULL, NULL);
-  if (n_axes == 0)
-    goto done;
-
-  ai = g_new0 (hb_ot_var_axis_info_t, n_axes);
-  design_coords = g_new (float, n_axes);
-
-  hb_ot_var_get_axis_infos (hb_face, 0, &n_axes, ai);
-  coords = hb_font_get_var_coords_normalized (hb_font, &length);
-  for (i = 0; i < length; i++)
-    design_coords[i] = denorm_coord (&ai[i], coords[i]);
-
-  if (hb_ot_var_get_named_instance_count (hb_face) > 0)
+  ret = FT_Get_MM_Var (ft_face, &ft_mm_var);
+  if (ret == 0)
     {
-      GtkWidget *label;
-      GtkWidget *combo;
+      unsigned int i;
+      FT_Fixed *coords;
 
-      label = gtk_label_new ("Instance");
-      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-      gtk_grid_attach (GTK_GRID (variations_grid), label, 0, -1, 2, 1);
+      coords = g_new (FT_Fixed, ft_mm_var->num_axis);
+      ret = FT_Get_Var_Design_Coordinates (ft_face, ft_mm_var->num_axis, coords);
 
-      combo = gtk_combo_box_text_new ();
-      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
-
-      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, combo, i);
-
-      for (i = 0; i < hb_ot_var_get_named_instance_count (hb_face); i++)
+      if (ft_mm_var->num_namedstyles > 0)
         {
-          if (matches_instance (hb_face, i, n_axes, design_coords))
-            {
-              gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i + 1);
-              break;
-            }
+           GtkWidget *label;
+           GtkWidget *combo;
+
+           label = gtk_label_new ("Instance");
+           gtk_label_set_xalign (GTK_LABEL (label), 0);
+           gtk_widget_set_halign (label, GTK_ALIGN_START);
+           gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
+           gtk_grid_attach (GTK_GRID (variations_grid), label, 0, -1, 2, 1);
+
+           combo = gtk_combo_box_text_new ();
+           gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
+           g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL);
+           gtk_grid_attach (GTK_GRID (variations_grid), combo, 1, -1, 2, 1);
+
+           gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "");
+
+           for (i = 0; i < ft_mm_var->num_namedstyles; i++)
+             add_instance (ft_face, ft_mm_var, &ft_mm_var->namedstyle[i], combo, i);
+           for (i = 0; i < ft_mm_var->num_namedstyles; i++)
+             {
+               if (matches_instance (&ft_mm_var->namedstyle[i], coords, ft_mm_var->num_axis))
+                 {
+                   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i + 1);
+                   break;
+                 }
+             }
+
+           instance_combo = combo;
         }
 
-      gtk_grid_attach (GTK_GRID (variations_grid), combo, 1, -1, 2, 1);
-      g_signal_connect (combo, "changed", G_CALLBACK (instance_changed), NULL);
-      instance_combo = combo;
-   }
+      if (ret == 0)
+        {
+          for (i = 0; i < ft_mm_var->num_axis; i++)
+            add_axis (&ft_mm_var->axis[i], coords[i], i);
 
-  for (i = 0; i < n_axes; i++)
-    add_axis (hb_face, &ai[i], design_coords[i], i);
+          add_font_plane (ft_mm_var->num_axis);
+        }
+      g_free (coords);
+      free (ft_mm_var);
+    }
 
-  add_font_plane (n_axes);
-
-done:
-  g_clear_object (&pango_font);
-  g_free (ai);
-  g_free (design_coords);
+  pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
+  g_object_unref (pango_font);
 }
 
-void
-font_features_font_changed (void)
+static void
+font_changed (void)
 {
   update_script_combo ();
   update_features ();
   update_font_variations ();
 }
 
-void
-font_features_script_changed (void)
+static void
+script_changed (void)
 {
   update_features ();
   update_display ();
 }
 
-void
-font_features_reset_features (void)
+static void
+reset_features (void)
 {
   GList *l;
 
@@ -1170,8 +1657,8 @@ switch_to_label (void)
   update_display ();
 }
 
-void
-font_features_toggle_edit (void)
+static void
+toggle_edit (void)
 {
   if (strcmp (gtk_stack_get_visible_child_name (GTK_STACK (stack)), "label") == 0)
     switch_to_entry ();
@@ -1179,8 +1666,8 @@ font_features_toggle_edit (void)
     switch_to_label ();
 }
 
-void
-font_features_stop_edit (void)
+static void
+stop_edit (void)
 {
   g_signal_emit_by_name (edit_toggle, "clicked");
 }
@@ -1195,7 +1682,7 @@ entry_key_press (GtkEventController *controller,
   if (keyval == GDK_KEY_Escape)
     {
       gtk_editable_set_text (GTK_EDITABLE (entry), text);
-      font_features_stop_edit ();
+      stop_edit ();
       return GDK_EVENT_STOP;
     }
 
@@ -1215,6 +1702,14 @@ do_font_features (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/font_features/font-features.ui");
 
+      gtk_builder_add_callback_symbol (builder, "update_display", update_display);
+      gtk_builder_add_callback_symbol (builder, "font_changed", font_changed);
+      gtk_builder_add_callback_symbol (builder, "script_changed", script_changed);
+      gtk_builder_add_callback_symbol (builder, "reset", reset_features);
+      gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
+      gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
+      gtk_builder_connect_signals (builder, NULL);
+
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
       label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
@@ -1228,7 +1723,7 @@ do_font_features (GtkWidget *do_widget)
       edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));
 
       controller = gtk_event_controller_key_new ();
-      g_object_set_data_full (G_OBJECT (entry), "controller", g_object_ref (controller), g_object_unref);
+      g_object_set_data_full (G_OBJECT (entry), "controller", controller, g_object_unref);
       g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
       gtk_widget_add_controller (entry, controller);
 
@@ -1331,14 +1826,12 @@ do_font_features (GtkWidget *do_widget)
       else
         g_hash_table_remove_all (axes);
 
-      font_features_font_changed ();
+      font_changed ();
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
-
-      update_display ();
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fontplane.c

@@ -19,6 +19,8 @@
 
 #include "fontplane.h"
 
+#include "gtk.h"
+
 enum {
   PROP_0,
   PROP_WEIGHT_ADJUSTMENT,

demos/gtk-demo/fontrendering.c

@@ -248,6 +248,7 @@ do_fontrendering (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/fontrendering/fontrendering.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/fontrendering.ui

@@ -165,11 +165,10 @@
         </child>
         <child>
           <object class="GtkBox">
+            <property name="orientation">horizontal</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <style>
-              <class name="linked"/>
-            </style>
+            <style><class name="linked"/></style>
             <child>
               <object class="GtkRadioButton" id="text_radio">
                 <property name="draw-indicator">0</property>
@@ -184,7 +183,7 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
+             <property name="left-attach">0</property>
               <property name="top-attach">3</property>
               <property name="column-span">7</property>
             </layout>

demos/gtk-demo/foreigndrawing.c

@@ -414,7 +414,7 @@ draw_menubar (GtkWidget     *widget,
   frame_context = get_style (NULL, "frame");
   border_context = get_style (frame_context, "border");
 
-  /* This information is taken from the GtkPopoverMenuBar docs, see "CSS nodes" */
+  /* This information is taken from the GtkMenuBar docs, see "CSS nodes" */
   menubar_context = get_style (NULL, "menubar");
   hovered_menuitem_context = get_style (menubar_context, "menuitem:hover");
   menuitem_context = get_style (menubar_context, "menuitem");
@@ -829,6 +829,7 @@ draw_spinbutton (GtkWidget *widget,
   GtkStyleContext *down_context;
   GtkIconTheme *icon_theme;
   GtkIconInfo *icon_info;
+  GdkPixbuf *pixbuf;
   GdkTexture *texture;
   gint icon_width, icon_height, icon_size;
   gint button_width;
@@ -856,22 +857,26 @@ draw_spinbutton (GtkWidget *widget,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   gtk_style_context_get (down_context,
                          "min-width", &icon_width, "min-height", &icon_height, NULL);
   icon_size = MIN (icon_width, icon_height);
   icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL));
+  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
   g_object_unref (icon_info);
   draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
                      &contents_x, &contents_y, &contents_width, &contents_height);
   gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 
   g_object_unref (down_context);

demos/gtk-demo/glarea.c

@@ -241,7 +241,7 @@ realize (GtkWidget *widget)
       fragment_path = "/glarea/glarea-gl.fs.glsl";
     }
 
-  init_buffers (NULL, &position_buffer);
+  init_buffers (&position_buffer, NULL);
   init_shaders (vertex_path, fragment_path, &program, &mvp_location);
 }
 

demos/gtk-demo/hypertext.c

@@ -41,7 +41,6 @@ show_page (GtkTextBuffer *buffer,
 
   gtk_text_buffer_set_text (buffer, "", 0);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
-  gtk_text_buffer_begin_irreversible_action (buffer);
   if (page == 1)
     {
       gtk_text_buffer_insert (buffer, &iter, "Some text to show that simple ", -1);
@@ -74,7 +73,6 @@ show_page (GtkTextBuffer *buffer,
                               "so that related items of information are connected.\n", -1);
       insert_link (buffer, &iter, "Go back", 1);
     }
-  gtk_text_buffer_end_irreversible_action (buffer);
 }
 
 /* Looks at all tags covering the position of iter in the text view,
@@ -260,7 +258,6 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_add_controller (view, controller);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),

demos/gtk-demo/iconscroll.c

@@ -1,229 +0,0 @@
-/* Benchmark/Scrolling
- *
- * This demo scrolls a view with various content.
- */
-
-#include <gtk/gtk.h>
-
-static guint tick_cb;
-static GtkAdjustment *hadjustment;
-static GtkAdjustment *vadjustment;
-static GtkWidget *window = NULL;
-static GtkWidget *scrolledwindow;
-static int selected;
-
-#define N_WIDGET_TYPES 4
-
-
-static int hincrement = 5;
-static int vincrement = 5;
-
-static gboolean
-scroll_cb (GtkWidget *widget,
-           GdkFrameClock *frame_clock,
-           gpointer data)
-{
-  double value;
-
-  value = gtk_adjustment_get_value (vadjustment);
-  if (value + vincrement <= gtk_adjustment_get_lower (vadjustment) ||
-     (value + vincrement >= gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment)))
-    vincrement = - vincrement;
-
-  gtk_adjustment_set_value (vadjustment, value + vincrement);
-
-  value = gtk_adjustment_get_value (hadjustment);
-  if (value + hincrement <= gtk_adjustment_get_lower (hadjustment) ||
-     (value + hincrement >= gtk_adjustment_get_upper (hadjustment) - gtk_adjustment_get_page_size (hadjustment)))
-    hincrement = - hincrement;
-
-  gtk_adjustment_set_value (hadjustment, value + hincrement);
-
-  return G_SOURCE_CONTINUE;
-}
-
-extern GtkWidget *create_icon (void);
-
-static void
-populate_icons (void)
-{
-  GtkWidget *grid;
-  int top, left;
-
-  grid = gtk_grid_new ();
-  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  g_object_set (grid, "margin", 10, NULL);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-
-  for (top = 0; top < 100; top++)
-    for (left = 0; left < 15; left++)
-      gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);
-
-  hincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
-}
-
-static char *content;
-static gsize content_len;
-
-extern void fontify (GtkTextBuffer *buffer);
-
-static void
-populate_text (gboolean hilight)
-{
-  GtkWidget *textview;
-  GtkTextBuffer *buffer;
-
-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, content, (int)content_len);
-
-  if (hilight)
-    fontify (buffer);
-
-  textview = gtk_text_view_new ();
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  hincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
-}
-
-static void
-populate_image (void)
-{
-  GtkWidget *image;
-
-  if (!content)
-    {
-      GBytes *bytes;
-
-      bytes = g_resources_lookup_data ("/sources/font_features.c", 0, NULL);
-      content = g_bytes_unref_to_data (bytes, &content_len);
-    }
-
-  image = gtk_picture_new_for_resource ("/sliding_puzzle/portland-rose.jpg");
-  gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);
-
-  hincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
-}
-
-static void
-set_widget_type (int type)
-{
-  if (tick_cb)
-    gtk_widget_remove_tick_callback (window, tick_cb);
-
-  if (gtk_bin_get_child (GTK_BIN (scrolledwindow)))
-    gtk_container_remove (GTK_CONTAINER (scrolledwindow),
-                          gtk_bin_get_child (GTK_BIN (scrolledwindow)));
-
-  selected = type;
-
-  switch (selected)
-    {
-    case 0:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling icons");
-      populate_icons ();
-      break;
-
-    case 1:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling plain text");
-      populate_text (FALSE);
-      break;
-
-    case 2:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling complex text");
-      populate_text (TRUE);
-      break;
-
-    case 3:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a big image");
-      populate_image ();
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
-}
-
-void
-iconscroll_next_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
-{
-  int new_index;
-
-  if (selected + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
-  else
-    new_index = selected + 1;
- 
-
-  set_widget_type (new_index);
-}
-
-void
-iconscroll_prev_clicked_cb (GtkButton *source,
-                            gpointer   user_data)
-{
-  int new_index;
-
-  if (selected - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected - 1;
-
-  set_widget_type (new_index);
-}
-
-GtkWidget *
-do_iconscroll (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkBuilder *builder;
-
-      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
-      gtk_widget_realize (window);
-      hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
-      vadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "vadjustment"));
-      set_widget_type (0);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/iconscroll.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
-    <property name="default-width">500</property>
-    <property name="default-height">500</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkBox">
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="iconscroll_prev_clicked_cb"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="iconscroll_next_clicked_cb"/>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow" id="scrolledwindow">
-        <property name="hscrollbar-policy">never</property>
-        <property name="hadjustment">
-          <object class="GtkAdjustment" id="hadjustment"/>
-        </property>
-        <property name="vadjustment">
-          <object class="GtkAdjustment" id="vadjustment"/>
-        </property>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/infobar.c

@@ -68,7 +68,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -80,7 +80,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -94,7 +94,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -106,7 +106,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 
@@ -119,7 +119,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
 

demos/gtk-demo/language-names.c

@@ -18,10 +18,6 @@
 
 #include "language-names.h"
 
-#ifndef ISO_CODES_PREFIX
-#define ISO_CODES_PREFIX "/usr"
-#endif
-
 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
 

demos/gtk-demo/listbox.ui

@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <menu id="menu1">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Email message</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Embed message</attribute>
-      </item>
-    </section>
-  </menu>
+  <object class="GtkMenu" id="menu1">
+    <child>
+      <object class="GtkMenuItem" id="menuitem1">
+        <property name="label" translatable="yes">Email message</property>
+        <property name="use-underline">1</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="menuitem2">
+        <property name="label" translatable="yes">Embed message</property>
+        <property name="use-underline">1</property>
+      </object>
+    </child>
+  </object>
   <template class="GtkMessageRow" parent="GtkListBoxRow">
     <child>
       <object class="GtkGrid" id="grid1">
@@ -167,7 +171,7 @@
                   <object class="GtkMenuButton" id="more-button">
                     <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="menu-model">menu1</property>
+                    <property name="popup">menu1</property>
                     <property name="relief">none</property>
                     <property name="label" translatable="yes">More...</property>
                   </object>

demos/gtk-demo/main.c

@@ -487,7 +487,7 @@ parse_chars (gchar     *text,
 }
 
 /* While not as cool as c-mode, this will do as a quick attempt at highlighting */
-void
+static void
 fontify (GtkTextBuffer *source_buffer)
 {
   GtkTextIter start_iter, next_iter, tmp_iter;
@@ -639,7 +639,7 @@ display_nothing (const char *resource)
 
   str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
   widget = gtk_label_new (str);
-  gtk_label_set_wrap (GTK_LABEL (widget), TRUE);
+  gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
 
   g_free (str);
 
@@ -748,9 +748,6 @@ load_file (const gchar *demoname,
 
   source_buffer = gtk_text_buffer_new (NULL);
 
-  gtk_text_buffer_begin_irreversible_action (info_buffer);
-  gtk_text_buffer_begin_irreversible_action (source_buffer);
-
   resource_filename = g_strconcat ("/sources/", filename, NULL);
   bytes = g_resources_lookup_data (resource_filename, 0, &err);
   g_free (resource_filename);
@@ -883,11 +880,9 @@ load_file (const gchar *demoname,
 
   fontify (source_buffer);
 
-  gtk_text_buffer_end_irreversible_action (source_buffer);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
   g_object_unref (source_buffer);
 
-  gtk_text_buffer_end_irreversible_action (info_buffer);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (info_view), info_buffer);
   g_object_unref (info_buffer);
 }
@@ -1003,6 +998,32 @@ row_activated_cb (GtkWidget         *tree_view,
   run_example_for_row (window, model, &iter);
 }
 
+static void
+start_cb (GtkMenuItem *item, GtkWidget *scrollbar)
+{
+  GtkAdjustment *adj;
+
+  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+}
+
+static void
+end_cb (GtkMenuItem *item, GtkWidget *scrollbar)
+{
+  GtkAdjustment *adj;
+
+  adj = gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (scrollbar));
+  gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj));
+}
+
+static gboolean
+scrollbar_popup (GtkWidget *scrollbar, GtkWidget *menu)
+{
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+
+  return TRUE;
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1011,12 +1032,23 @@ activate (GApplication *app)
   GtkWidget *widget;
   GtkTreeModel *model;
   GtkTreeIter iter;
+  GError *error = NULL;
+  GtkWidget *sw;
+  GtkWidget *scrollbar;
+  GtkWidget *menu;
+  GtkWidget *item;
 
   static GActionEntry win_entries[] = {
     { "run", activate_run, NULL, NULL, NULL }
   };
 
-  builder = gtk_builder_new_from_resource ("/ui/main.ui");
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/ui/main.ui", &error);
+  if (error != NULL)
+    {
+      g_critical ("%s", error->message);
+      exit (1);
+    }
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
@@ -1032,6 +1064,21 @@ activate (GApplication *app)
   treeview = (GtkWidget *)gtk_builder_get_object (builder, "treeview");
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
 
+  sw = (GtkWidget *)gtk_builder_get_object (builder, "source-scrolledwindow");
+  scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (sw));
+
+  menu = gtk_menu_new ();
+
+  item = gtk_menu_item_new_with_label ("Start");
+  g_signal_connect (item, "activate", G_CALLBACK (start_cb), scrollbar);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_menu_item_new_with_label ("End");
+  g_signal_connect (item, "activate", G_CALLBACK (end_cb), scrollbar);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  g_signal_connect (scrollbar, "popup-menu", G_CALLBACK (scrollbar_popup), menu);
+
   load_file (gtk_demos[0].name, gtk_demos[0].filename);
 
   populate_model (model);

demos/gtk-demo/markup.c

@@ -29,10 +29,8 @@ source_toggled (GtkToggleButton *button)
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_get_bounds (buffer, &start, &end);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_delete (buffer, &start, &end);
       gtk_text_buffer_insert_markup (buffer, &start, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
       g_free (markup);
 
       gtk_stack_set_visible_child_name (GTK_STACK (stack), "formatted");
@@ -108,15 +106,11 @@ do_markup (GtkWidget *do_widget)
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_insert_markup (buffer, &iter, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view2));
       gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_begin_irreversible_action (buffer);
       gtk_text_buffer_insert (buffer, &iter, markup, -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
 
       g_bytes_unref (bytes);
 

demos/gtk-demo/menus.c

@@ -0,0 +1,147 @@
+/* Menus
+ *
+ * There are several widgets involved in displaying menus. The
+ * GtkMenuBar widget is a menu bar, which normally appears horizontally
+ * at the top of an application, but can also be layed out vertically.
+ * The GtkMenu widget is the actual menu that pops up. Both GtkMenuBar
+ * and GtkMenu are subclasses of GtkMenuShell; a GtkMenuShell contains
+ * menu items (GtkMenuItem). Each menu item contains text and/or images
+ * and can be selected by the user.
+ *
+ * There are several kinds of menu item, including plain GtkMenuItem,
+ * GtkCheckMenuItem which can be checked/unchecked, GtkRadioMenuItem
+ * which is a check menu item that's in a mutually exclusive group,
+ * GtkSeparatorMenuItem which is a separator bar, GtkTearoffMenuItem
+ * which allows a GtkMenu to be torn off, and GtkImageMenuItem which
+ * can place a GtkImage or other widget next to the menu text.
+ *
+ * A GtkMenuItem can have a submenu, which is simply a GtkMenu to pop
+ * up when the menu item is selected. Typically, all menu items in a menu bar
+ * have submenus.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <stdio.h>
+
+static GtkWidget *
+create_menu (gint depth)
+{
+  GtkWidget *menu;
+  GtkRadioMenuItem *last_item;
+  char buf[32];
+  int i, j;
+
+  if (depth < 1)
+    return NULL;
+
+  menu = gtk_menu_new ();
+  last_item = NULL;
+
+  for (i = 0, j = 1; i < 5; i++, j++)
+    {
+      GtkWidget *menu_item;
+
+      sprintf (buf, "item %2d - %d", depth, j);
+
+      menu_item = gtk_radio_menu_item_new_with_label_from_widget (NULL, buf);
+      gtk_radio_menu_item_join_group (GTK_RADIO_MENU_ITEM (menu_item), last_item);
+      last_item = GTK_RADIO_MENU_ITEM (menu_item);
+
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+      gtk_widget_show (menu_item);
+      if (i == 3)
+        gtk_widget_set_sensitive (menu_item, FALSE);
+
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), create_menu (depth - 1));
+    }
+
+  return menu;
+}
+
+static void
+change_orientation (GtkWidget *button,
+                    GtkWidget *menubar)
+{
+  GtkWidget *parent;
+  GtkOrientation orientation;
+
+  parent = gtk_widget_get_parent (menubar);
+  orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (parent));
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (parent), 1 - orientation);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_menus (GtkWidget *do_widget)
+{
+  GtkWidget *box;
+  GtkWidget *box1;
+  GtkWidget *box2;
+  GtkWidget *button;
+
+  if (!window)
+    {
+      GtkWidget *menubar;
+      GtkWidget *menu;
+      GtkWidget *menuitem;
+      GtkAccelGroup *accel_group;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Menus");
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK(gtk_widget_destroyed), &window);
+
+      accel_group = gtk_accel_group_new ();
+      gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_container_add (GTK_CONTAINER (box), box1);
+
+      menubar = gtk_menu_bar_new ();
+      gtk_widget_set_hexpand (menubar, TRUE);
+      gtk_container_add (GTK_CONTAINER (box1), menubar);
+
+      menu = create_menu (2);
+
+      menuitem = gtk_menu_item_new_with_label ("test\nline2");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      menuitem = gtk_menu_item_new_with_label ("foo");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (3));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      menuitem = gtk_menu_item_new_with_label ("bar");
+      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), create_menu (4));
+      gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
+
+      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_container_add (GTK_CONTAINER (box1), box2);
+
+      button = gtk_button_new_with_label ("Flip");
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (change_orientation), menubar);
+      gtk_container_add (GTK_CONTAINER (box2), button);
+
+      button = gtk_button_new_with_label ("Close");
+      g_signal_connect_swapped (button, "clicked",
+                                G_CALLBACK(gtk_widget_destroy), window);
+      gtk_container_add (GTK_CONTAINER (box2), button);
+      gtk_window_set_default_widget (GTK_WINDOW (window), button);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/meson.build

@@ -4,6 +4,7 @@ demos = files([
   'application_demo.c',
   'assistant.c',
   'builder.c',
+  'changedisplay.c',
   'clipboard.c',
   'colorsel.c',
   'combobox.c',
@@ -21,8 +22,8 @@ demos = files([
   'drawingarea.c',
   'dnd.c',
   'editable_cells.c',
+  'entry_buffer.c',
   'entry_completion.c',
-  'entry_undo.c',
   'expander.c',
   'filtermodel.c',
   'fishbowl.c',
@@ -33,7 +34,6 @@ demos = files([
   'glarea.c',
   'headerbar.c',
   'hypertext.c',
-  'iconscroll.c',
   'iconview.c',
   'iconview_edit.c',
   'images.c',
@@ -43,6 +43,7 @@ demos = files([
   'flowbox.c',
   'list_store.c',
   'markup.c',
+  'menus.c',
   'modelbutton.c',
   'overlay.c',
   'overlay2.c',
@@ -71,7 +72,6 @@ demos = files([
   'tabs.c',
   'tagged_entry.c',
   'textmask.c',
-  'textundo.c',
   'textview.c',
   'textscroll.c',
   'themes.c',

demos/gtk-demo/modelbutton.c

@@ -14,8 +14,8 @@
 
 #include <gtk/gtk.h>
 
-void
-modelbutton_tool_clicked (GtkButton *button)
+static void
+tool_clicked (GtkButton *button)
 {
   gboolean active;
 
@@ -40,6 +40,8 @@ do_modelbutton (GtkWidget *do_widget)
       GActionGroup *actions;
 
       builder = gtk_builder_new_from_resource ("/modelbutton/modelbutton.ui");
+      gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/modelbutton.ui

@@ -14,19 +14,34 @@
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_a</property>
-            <property name="label">Color</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Color</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_b</property>
-            <property name="label">Flavors</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Flavors</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_c</property>
-            <property name="label">Tools</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Tools</property>
+                <property name="hexpand">1</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>
@@ -42,6 +57,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;red&apos;</property>
             <property name="text">Red</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
@@ -49,6 +65,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;green&apos;</property>
             <property name="text">Green</property>
+            <property name="inverted">1</property>
           </object>
         </child>
         <child>
@@ -56,6 +73,7 @@
             <property name="action-name">win.color</property>
             <property name="action-target">&apos;blue&apos;</property>
             <property name="text">Blue</property>
+            <property name="inverted">1</property>
           </object>
         </child>
       </object>
@@ -101,21 +119,21 @@
           <object class="GtkModelButton">
             <property name="text">Hammer</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Screwdriver</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="text">Drill</property>
             <property name="role">check</property>
-            <signal name="clicked" handler="modelbutton_tool_clicked"/>
+            <signal name="clicked" handler="tool_clicked"/>
           </object>
         </child>
       </object>

demos/gtk-demo/revealer.c

@@ -69,6 +69,7 @@ do_revealer (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.c

@@ -18,6 +18,7 @@ do_scale (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/scale.ui

@@ -75,11 +75,11 @@
             <property name="adjustment">adjustment2</property>
             <property name="hexpand">1</property>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <accessibility>
               <relation type="labelled-by" target="label_marks"/>
@@ -115,11 +115,11 @@
               <relation type="labelled-by" target="label_discrete"/>
             </accessibility>
             <marks>
-              <mark value="0" position="bottom"></mark>
-              <mark value="1" position="bottom"></mark>
-              <mark value="2" position="bottom"></mark>
-              <mark value="3" position="bottom"></mark>
-              <mark value="4" position="bottom"></mark>
+              <mark value="0" position="bottom"/>
+              <mark value="1" position="bottom"/>
+              <mark value="2" position="bottom"/>
+              <mark value="3" position="bottom"/>
+              <mark value="4" position="bottom"/>
             </marks>
             <layout>
               <property name="left-attach">1</property>

demos/gtk-demo/shortcuts.c

@@ -25,44 +25,44 @@ show_shortcuts (GtkWidget   *window,
   g_object_unref (builder);
 }
 
-void
-shortcuts_builder_shortcuts (GtkWidget *window)
+static void
+builder_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-builder", NULL);
 }
 
-void
-shortcuts_gedit_shortcuts (GtkWidget *window)
+static void
+gedit_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-gedit", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts (GtkWidget *window)
+static void
+clocks_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", NULL);
 }
 
-void
-shortcuts_clocks_shortcuts_stopwatch (GtkWidget *window)
+static void
+clocks_shortcuts_stopwatch (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-clocks", "stopwatch");
 }
 
-void
-shortcuts_boxes_shortcuts (GtkWidget *window)
+static void
+boxes_shortcuts (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", NULL);
 }
 
-void
-shortcuts_boxes_shortcuts_wizard (GtkWidget *window)
+static void
+boxes_shortcuts_wizard (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "wizard");
 }
 
-void
-shortcuts_boxes_shortcuts_display (GtkWidget *window)
+static void
+boxes_shortcuts_display (GtkWidget *window)
 {
   show_shortcuts (window, "shortcuts-boxes", "display");
 }
@@ -86,6 +86,16 @@ do_shortcuts (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/shortcuts/shortcuts.ui");
+      gtk_builder_add_callback_symbols (builder,
+                                        "builder_shortcuts", G_CALLBACK (builder_shortcuts),
+                                        "gedit_shortcuts", G_CALLBACK (gedit_shortcuts),
+                                        "clocks_shortcuts", G_CALLBACK (clocks_shortcuts),
+                                        "clocks_shortcuts_stopwatch", G_CALLBACK (clocks_shortcuts_stopwatch),
+                                        "boxes_shortcuts", G_CALLBACK (boxes_shortcuts),
+                                        "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
+                                        "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
+                                        NULL);
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/shortcuts.ui

@@ -10,43 +10,43 @@
         <child>
           <object class="GtkButton">
             <property name="label">Builder</property>
-            <signal name="clicked" handler="shortcuts_builder_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">GEdit</property>
-            <signal name="clicked" handler="shortcuts_gedit_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - All</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Clocks - Stopwatch</property>
-            <signal name="clicked" handler="shortcuts_clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
+            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Wizard</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_wizard" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
           </object>
         </child>
         <child>
           <object class="GtkButton">
             <property name="label">Boxes - Display</property>
-            <signal name="clicked" handler="shortcuts_boxes_shortcuts_display" swapped="1" object="window1"/>
+            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
           </object>
         </child>
       </object>

demos/gtk-demo/sidebar.c

@@ -54,7 +54,10 @@ do_sidebar (GtkWidget *do_widget)
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
       gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
-      gtk_widget_set_hexpand (stack, TRUE);
+
+      /* Separator between sidebar and stack */
+      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+      gtk_container_add (GTK_CONTAINER(box), widget);
 
       gtk_container_add (GTK_CONTAINER (box), stack);
 
@@ -63,7 +66,6 @@ do_sidebar (GtkWidget *do_widget)
           if (i == 0)
             {
               widget = gtk_image_new_from_icon_name ("org.gtk.Demo4");
-              gtk_style_context_add_class (gtk_widget_get_style_context (widget), "icon-dropshadow");
               gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
             }
           else

demos/gtk-demo/spinbutton.c

@@ -11,9 +11,9 @@
 #include <math.h>
 #include <stdlib.h>
 
-gint
-spinbutton_hex_spin_input (GtkSpinButton *spin_button,
-                           gdouble       *new_val)
+static gint
+hex_spin_input (GtkSpinButton *spin_button,
+                gdouble       *new_val)
 {
   const gchar *buf;
   gchar *err;
@@ -28,8 +28,8 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
     return TRUE;
 }
 
-gint
-spinbutton_hex_spin_output (GtkSpinButton *spin_button)
+static gint
+hex_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -48,9 +48,9 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_input (GtkSpinButton *spin_button,
-                            gdouble       *new_val)
+static gint
+time_spin_input (GtkSpinButton *spin_button,
+                 gdouble       *new_val)
 {
   const gchar *text;
   gchar **str;
@@ -87,8 +87,8 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_time_spin_output (GtkSpinButton *spin_button)
+static gint
+time_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
@@ -121,9 +121,9 @@ static gchar *month[12] = {
   "December"
 };
 
-gint
-spinbutton_month_spin_input (GtkSpinButton *spin_button,
-                             gdouble       *new_val)
+static gint
+month_spin_input (GtkSpinButton *spin_button,
+                  gdouble       *new_val)
 {
   gint i;
   gchar *tmp1, *tmp2;
@@ -150,8 +150,8 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
   return TRUE;
 }
 
-gint
-spinbutton_month_spin_output (GtkSpinButton *spin_button)
+static gint
+month_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gdouble value;
@@ -191,6 +191,15 @@ do_spinbutton (GtkWidget *do_widget)
     GtkWidget *label;
 
     builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
+    gtk_builder_add_callback_symbols (builder,
+                                      "hex_spin_input", G_CALLBACK (hex_spin_input),
+                                      "hex_spin_output", G_CALLBACK (hex_spin_output),
+                                      "time_spin_input", G_CALLBACK (time_spin_input),
+                                      "time_spin_output", G_CALLBACK (time_spin_output),
+                                      "month_spin_input", G_CALLBACK (month_spin_input),
+                                      "month_spin_output", G_CALLBACK (month_spin_output),
+                                      NULL);
+    gtk_builder_connect_signals (builder, NULL);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));

demos/gtk-demo/spinbutton.ui

@@ -83,8 +83,8 @@
             <property name="halign">start</property>
             <property name="width-chars">4</property>
             <property name="adjustment">hex_adjustment</property>
-            <signal name="input" handler="spinbutton_hex_spin_input"/>
-            <signal name="output" handler="spinbutton_hex_spin_output"/>
+            <signal name="input" handler="hex_spin_input"/>
+            <signal name="output" handler="hex_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -119,8 +119,8 @@
             <property name="halign">start</property>
             <property name="width-chars">5</property>
             <property name="adjustment">time_adjustment</property>
-            <signal name="input" handler="spinbutton_time_spin_input"/>
-            <signal name="output" handler="spinbutton_time_spin_output"/>
+            <signal name="input" handler="time_spin_input"/>
+            <signal name="output" handler="time_spin_output"/>
             <property name="wrap">1</property>
             <layout>
               <property name="left-attach">1</property>
@@ -154,8 +154,8 @@
           <object class="GtkSpinButton" id="month_spin">
             <property name="halign">start</property>
             <property name="width-chars">9</property>
-            <signal name="input" handler="spinbutton_month_spin_input"/>
-            <signal name="output" handler="spinbutton_month_spin_output"/>
+            <signal name="input" handler="month_spin_input"/>
+            <signal name="output" handler="month_spin_output"/>
             <property name="adjustment">month_adjustment</property>
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>

demos/gtk-demo/stack.c

@@ -18,6 +18,7 @@ do_stack (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
+      gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

demos/gtk-demo/textundo.c

@@ -1,71 +0,0 @@
-/* Text View/Undo and Redo
- *
- * The GtkTextView supports undo and redo through the use of a
- * GtkTextBuffer. You can enable or disable undo support using
- * gtk_text_buffer_set_enable_undo().
- *
- * Use Primary+Z to undo and Primary+Shift+Z or Primary+Y to
- * redo previously undone operations.
- */
-
-#include <gtk/gtk.h>
-#include <stdlib.h> /* for exit() */
-
-GtkWidget *
-do_textundo (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkWidget *sw;
-      GtkTextBuffer *buffer;
-      GtkTextIter iter;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_window_set_title (GTK_WINDOW (window), "TextView Undo");
-
-      view = gtk_text_view_new ();
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
-      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_enable_undo (buffer, TRUE);
-
-      /* this text cannot be undone */
-      gtk_text_buffer_begin_irreversible_action (buffer);
-      gtk_text_buffer_get_start_iter (buffer, &iter);
-      gtk_text_buffer_insert (buffer, &iter,
-                              "Type to add more text.\n"
-                              "Use Primary+Z to undo and Primary+Shift+Z to redo a previously undone action.\n"
-                              "\n",
-                              -1);
-      gtk_text_buffer_end_irreversible_action (buffer);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}

demos/gtk-demo/textview.c

@@ -128,23 +128,24 @@ insert_text (GtkTextBuffer *buffer)
 {
   GtkTextIter iter;
   GtkTextIter start, end;
+  GdkPixbuf *pixbuf;
   GdkTexture *texture;
   GtkIconTheme *icon_theme;
 
   icon_theme = gtk_icon_theme_get_default ();
-  texture = GDK_TEXTURE (gtk_icon_theme_load_icon (icon_theme,
-                                                   "gtk3-demo",
-                                                   32,
-                                                   GTK_ICON_LOOKUP_GENERIC_FALLBACK,
-                                                   NULL));
-  g_assert (texture);
+  pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                     "gtk3-demo",
+                                     32,
+                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                     NULL);
+  g_assert (pixbuf);
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
 
   /* get start of buffer; each insertion will revalidate the
    * iterator to point to just after the inserted text.
    */
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
 
-  gtk_text_buffer_begin_irreversible_action (buffer);
   gtk_text_buffer_insert (buffer, &iter,
       "The text widget can display text with all kinds of nifty attributes. "
       "It also supports multiple views of the same buffer; this demo is "
@@ -378,8 +379,7 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_get_bounds (buffer, &start, &end);
   gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
 
-  gtk_text_buffer_end_irreversible_action (buffer);
-
+  g_object_unref (pixbuf);
   g_object_unref (texture);
 }
 

demos/gtk-demo/themes.ui

@@ -6,235 +6,236 @@
       <object class="GtkHeaderBar" id="header">
         <property name="show-title-buttons">1</property>
         <child type="end">
-          <object class="GtkLabel" id="fps"/>
+          <object class="GtkLabel" id="fps">
+          </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">10</property>
-        <property name="row-spacing">10</property>
-        <property name="orientation">vertical</property>
+  <object class="GtkGrid" id="grid">
+    <property name="margin">10</property>
+    <property name="row-spacing">10</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="show-arrow">0</property>
+        <style>
+          <class name="primary-toolbar"/>
+        </style>
         <child>
-          <object class="GtkToolbar">
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Raised Active</property>
+            <property name="use-underline">1</property>
+            <property name="is-important">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="active">1</property>
+            <style>
+              <class name="raised"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find</property>
+            <property name="is-important">1</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="can-focus">1</property>
+                <property name="width-chars">10</property>
+                <property name="invisible-char">•</property>
+                <property name="placeholder-text" translatable="yes">Search...</property>
+                <property name="secondary-icon-name">edit-find-symbolic</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToolItem">
+            <child>
+              <object class="GtkSwitch" id="switch1">
+                <property name="can-focus">1</property>
+                <property name="valign">center</property>
+                <property name="tooltip_text">Switch it</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="valign">center</property>
+        <property name="halign">center</property>
+        <style>
+          <class name="linked"/>
+        </style>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">Hi, I am a button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">And I&apos;m another button</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="label" translatable="yes">This is a button party!</property>
+            <property name="can-focus">1</property>
+            <property name="receives-default">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToolbar">
+        <property name="hexpand">1</property>
+        <property name="toolbar-style">icons</property>
+        <style>
+          <class name="inline-toolbar"/>
+        </style>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Normal</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-add-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="label" translatable="yes">Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">list-remove-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">edit-find-symbolic</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleToolButton">
+            <property name="homogeneous">1</property>
+            <property name="sensitive">0</property>
+            <property name="label" translatable="yes">Insensitive Active</property>
+            <property name="use-underline">1</property>
+            <property name="icon-name">go-up-symbolic</property>
+            <property name="active">1</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="spacing">10</property>
+        <child>
+          <object class="GtkButton">
+            <property name="label">Plain</property>
+            <property name="halign">end</property>
             <property name="hexpand">1</property>
-            <property name="show-arrow">0</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Raised Active</property>
-                <property name="use-underline">1</property>
-                <property name="is-important">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="active">1</property>
-                <style>
-                  <class name="raised"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find</property>
-                <property name="is-important">1</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkEntry" id="entry1">
-                    <property name="can-focus">1</property>
-                    <property name="width-chars">10</property>
-                    <property name="invisible-char">•</property>
-                    <property name="placeholder-text" translatable="yes">Search...</property>
-                    <property name="secondary-icon-name">edit-find-symbolic</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToolItem">
-                <child>
-                  <object class="GtkSwitch" id="switch1">
-                    <property name="can-focus">1</property>
-                    <property name="valign">center</property>
-                    <property name="tooltip_text">Switch it</property>
-                  </object>
-                </child>
-              </object>
-            </child>
+            <property name="vexpand">1</property>
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="valign">center</property>
-            <property name="halign">center</property>
+          <object class="GtkButton">
+            <property name="label">Destructive</property>
             <style>
-              <class name="linked"/>
+              <class name="destructive-action"/>
             </style>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Hi, I am a button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">And I&apos;m another button</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label" translatable="yes">This is a button party!</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
-              </object>
-            </child>
           </object>
         </child>
         <child>
-          <object class="GtkToolbar">
-            <property name="hexpand">1</property>
-            <property name="toolbar-style">icons</property>
+          <object class="GtkButton">
+            <property name="label">Suggested</property>
             <style>
-              <class name="inline-toolbar"/>
+              <class name="suggested-action"/>
             </style>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Normal</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-add-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="label" translatable="yes">Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">list-remove-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">edit-find-symbolic</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkToggleToolButton">
-                <property name="homogeneous">1</property>
-                <property name="sensitive">0</property>
-                <property name="label" translatable="yes">Insensitive Active</property>
-                <property name="use-underline">1</property>
-                <property name="icon-name">go-up-symbolic</property>
-                <property name="active">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Plain</property>
-                <property name="halign">end</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Destructive</property>
-                <style>
-                  <class name="destructive-action"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="label">Suggested</property>
-                <style>
-                  <class name="suggested-action"/>
-                </style>
-              </object>
-            </child>
           </object>
         </child>
       </object>
     </child>
   </object>
+    </child>
+  </object>
 </interface>

demos/gtk-demo/theming.ui

@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkGrid" id="grid">
     <property name="row-spacing">10</property>
-    <property name="margin">10</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkToolbar">
@@ -93,7 +92,6 @@
             <child>
               <object class="GtkSwitch" id="switch1">
                 <property name="can-focus">1</property>
-                <property name="valign">center</property>
                 <property name="tooltip_text">Switch it</property>
               </object>
             </child>

demos/icon-browser/iconbrowserwin.c

@@ -81,14 +81,11 @@ get_icon (GtkWidget *image, const gchar *name, gint size)
 {
   GtkIconInfo *info;
   GtkStyleContext *context;
-  GdkTexture *texture;
   GdkPixbuf *pixbuf;
 
   context = gtk_widget_get_style_context (image);
   info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL));
-  pixbuf = gdk_pixbuf_get_from_texture (texture);
-  g_object_unref (texture);
+  pixbuf = gtk_icon_info_load_symbolic_for_context (info, context, NULL, NULL);
   g_object_unref (info);
 
   return pixbuf;

demos/node-editor/node-editor-application.c

@@ -26,9 +26,9 @@
 static const char *css =
 "textview.editor {"
 "  color: rgb(192, 197, 206);"
-"  caret-color: currentColor;"
+"  caret-color: white;"
 "}"
-"textview.editor > text {"
+"textview.editor text {"
 "  background-color: rgb(43, 48, 59);"
 "}"
 ;

demos/widget-factory/widget-factory.c

@@ -1003,9 +1003,6 @@ populate_flowbox (GtkWidget *flowbox)
 
   while ((name = g_dir_read_name (dir)) != NULL)
     {
-      if (g_str_has_suffix (name, ".xml"))
-        continue;
-
       filename = g_build_filename (location, name, NULL);
       file = g_file_new_for_path (filename);
       stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
@@ -1020,7 +1017,7 @@ populate_flowbox (GtkWidget *flowbox)
           bd = g_new (BackgroundData, 1);
           bd->flowbox = flowbox;
           bd->filename = filename;
-          gdk_pixbuf_new_from_stream_at_scale_async (stream, 110, 110, TRUE, NULL,
+          gdk_pixbuf_new_from_stream_at_scale_async (stream, 110, 110, TRUE, NULL, 
                                                      background_loaded_cb, bd);
         }
 
@@ -1053,6 +1050,27 @@ row_activated (GtkListBox *box, GtkListBoxRow *row)
     }
 }
 
+static void
+set_accel (GtkApplication *app, GtkWidget *widget)
+{
+  GtkWidget *accel_label;
+  const gchar *action;
+  gchar **accels;
+  guint key;
+  GdkModifierType mods;
+
+  accel_label = gtk_bin_get_child (GTK_BIN (widget));
+  g_assert (GTK_IS_ACCEL_LABEL (accel_label));
+
+  action = gtk_actionable_get_action_name (GTK_ACTIONABLE (widget));
+  accels = gtk_application_get_accels_for_action (app, action);
+
+  gtk_accelerator_parse (accels[0], &key, &mods);
+  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (accel_label), key, mods);
+
+  g_strfreev (accels);
+}
+
 typedef struct
 {
   GtkTextView tv;
@@ -1631,7 +1649,7 @@ set_up_context_popover (GtkWidget *widget,
   GtkWidget *popover = gtk_popover_menu_new_from_model (widget, model);
   GtkGesture *gesture;
 
-  gtk_popover_set_has_arrow (GTK_POPOVER (popover), FALSE);
+  g_object_set (popover, "has-arrow", FALSE, NULL);
   gesture = gtk_gesture_click_new ();
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
   g_signal_connect (gesture, "pressed", G_CALLBACK (clicked_cb), popover);
@@ -1642,7 +1660,6 @@ static void
 activate (GApplication *app)
 {
   GtkBuilder *builder;
-  GtkBuilderScope *scope;
   GtkWindow *window;
   GtkWidget *widget;
   GtkWidget *widget2;
@@ -1695,25 +1712,21 @@ activate (GApplication *app)
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
 
-  builder = gtk_builder_new ();
-  scope = gtk_builder_cscope_new ();
-  gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-          "on_entry_icon_release", (GCallback)on_entry_icon_release,
-          "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed,
-          "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip,
-          "on_record_button_toggled", (GCallback)on_record_button_toggled,
-          "on_page_combo_changed", (GCallback)on_page_combo_changed,
-          "on_range_from_changed", (GCallback)on_range_from_changed,
-          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "tab_close_cb", (GCallback)tab_close_cb,
-          "increase_icon_size", (GCallback)increase_icon_size,
-          "decrease_icon_size", (GCallback)decrease_icon_size,
-          "reset_icon_size", (GCallback)reset_icon_size,
-          "osd_frame_pressed", (GCallback)osd_frame_pressed,
-          NULL);
-  gtk_builder_set_scope (builder, scope);
-  g_object_unref (scope);
-  gtk_builder_add_from_resource (builder, "/org/gtk/WidgetFactory4/widget-factory.ui", NULL);
+  builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui");
+  gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed);
+  gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip);
+  gtk_builder_add_callback_symbol (builder, "on_record_button_toggled", (GCallback)on_record_button_toggled);
+  gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
+  gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
+  gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
+  gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
+  gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
+  gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
+
+  gtk_builder_connect_signals (builder, NULL);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);
@@ -1842,6 +1855,13 @@ activate (GApplication *app)
   g_object_set_data (G_OBJECT (widget2), "range_to_spin", widget3);
   g_object_set_data (G_OBJECT (widget), "print_button", widget4);
 
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "quitmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "deletemenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "searchmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "darkmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "aboutmenuitem")));
+  set_accel (GTK_APPLICATION (app), GTK_WIDGET (gtk_builder_get_object (builder, "bgmenuitem")));
+
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "tooltextview");
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbutton1");

demos/widget-factory/widget-factory.ui

@@ -598,6 +598,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
+                                    <layout>
+                                      <property name="left-attach">0</property>
+                                      <property name="top-attach">0</property>
+                                    </layout>
                                   </object>
                                 </child>
                                 <child>
@@ -662,8 +666,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="can-focus">1</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
                                       <property name="left-attach">1</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -736,6 +740,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="active">1</property>
                                     <layout>
                                       <property name="left-attach">2</property>
+                                      <property name="top-attach">0</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -966,11 +971,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="adjustment">adjustment3</property>
                                 <property name="restrict-to-fill-level">0</property>
                                 <marks>
-                                  <mark value="0" position="bottom"></mark>
-                                  <mark value="1" position="bottom"></mark>
-                                  <mark value="2" position="bottom"></mark>
-                                  <mark value="3" position="bottom"></mark>
-                                  <mark value="4" position="bottom"></mark>
+                                  <mark value="0" position="bottom"/>
+                                  <mark value="1" position="bottom"/>
+                                  <mark value="2" position="bottom"/>
+                                  <mark value="3" position="bottom"/>
+                                  <mark value="4" position="bottom"/>
                                 </marks>
                               </object>
                             </child>
@@ -1570,7 +1575,7 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="icon-name">org.gtk.WidgetFactory4</property>
                                                 <property name="pixel-size">256</property>
                                                 <style>
-                                                  <class name="icon-dropshadow"/>
+                                                  <class name="icon-dropshadow" />
                                                 </style>
                                               </object>
                                             </property>
@@ -1721,11 +1726,15 @@ microphone-sensitivity-medium-symbolic</property>
                                               </object>
                                             </child>
                                             <child>
-                                              <object class="GtkSpinButton">
-                                                <property name="adjustment">adjustment1</property>
-                                                <property name="hexpand">1</property>
+                                              <object class="GtkImage">
+                                                <property name="icon-name">object-select-symbolic</property>
                                                 <property name="halign">end</property>
                                                 <property name="valign">center</property>
+                                                <property name="margin-top">6</property>
+                                                <property name="margin-bottom">6</property>
+                                                <property name="margin-start">12</property>
+                                                <property name="margin-end">12</property>
+                                                <property name="opacity">0</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1814,6 +1823,253 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="menu-model">menu_bar_model</property>
                                       </object>
                                     </child>
+                                    <child>
+                                      <object class="GtkMenuBar">
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem1">
+                                            <property name="label" translatable="yes">File</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu1">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem101">
+                                                    <property name="label" translatable="yes">_New</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem102">
+                                                    <property name="label" translatable="yes">_Open</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem103">
+                                                    <property name="label" translatable="yes">_Save</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem104">
+                                                    <property name="label" translatable="yes">Save _As</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkSeparatorMenuItem" id="separatormenuitem1"/>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="quitmenuitem">
+                                                    <property name="label" translatable="yes">_Quit</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.quit</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem2">
+                                            <property name="label" translatable="yes">Edit</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu2">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem106">
+                                                    <property name="label" translatable="yes">Cu_t</property>
+                                                    <property name="can-focus">1</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem107">
+                                                    <property name="label" translatable="yes">_Copy</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="menuitem108">
+                                                    <property name="label" translatable="yes">_Paste</property>
+                                                    <property name="use-underline">1</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="deletemenuitem">
+                                                    <property name="label" translatable="yes">_Delete</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.delete</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="searchmenuitem">
+                                                    <property name="label" translatable="yes">_Search</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.search</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="togglesmenuitem">
+                                                    <property name="label">Checks &amp; Radios</property>
+                                                    <property name="use-underline">1</property>
+                                                    <child type="submenu">
+                                                      <object class="GtkMenu" id="togglessubmenu">
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem1">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem2">
+                                                            <property name="label">_Check</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem3">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem4">
+                                                            <property name="label">_Check</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem5">
+                                                            <property name="label">_Check</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkCheckMenuItem" id="checkmenuitem6">
+                                                            <property name="label">_Check</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkSeparatorMenuItem" id="separatormenuitem"/>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem1">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem2">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="active">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem3">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem4">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem5">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkRadioMenuItem" id="radiomenuitem6">
+                                                            <property name="label">_Radio</property>
+                                                            <property name="inconsistent">1</property>
+                                                            <property name="sensitive">0</property>
+                                                            <property name="use-underline">1</property>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem3">
+                                            <property name="label" translatable="yes">View</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="view-menu">
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="darkmenuitem">
+                                                    <property name="label">_Dark theme</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.dark</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="toolbarmenuitem">
+                                                    <property name="label">_Toolbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.toolbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckMenuItem" id="statusbarmenuitem">
+                                                    <property name="label">_Statusbar</property>
+                                                    <property name="active">1</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.statusbar</property>
+                                                  </object>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkMenuItem" id="bgmenuitem">
+                                                    <property name="label">_Select Background</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">win.background</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child>
+                                          <object class="GtkMenuItem" id="menuitem4">
+                                            <property name="label" translatable="yes">Help</property>
+                                            <property name="use-underline">1</property>
+                                            <child type="submenu">
+                                              <object class="GtkMenu" id="menu3">
+                                                <child>
+                                                  <object class="GtkMenuItem" id="aboutmenuitem">
+                                                    <property name="label" translatable="yes">_About</property>
+                                                    <property name="use-underline">1</property>
+                                                    <property name="action-name">app.about</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                      </object>
+                                    </child>
                                     <child>
                                       <object class="GtkToolbar" id="toolbar">
                                         <child>
@@ -1862,7 +2118,7 @@ microphone-sensitivity-medium-symbolic</property>
                                       <object class="GtkInfoBar" id="infobar">
                                         <property name="visible">0</property>
                                         <property name="show-close-button">1</property>
-                                        <child>
+                                        <child internal-child="content_area">
                                           <object class="GtkBox">
                                             <child>
                                               <object class="GtkLabel">
@@ -1873,11 +2129,9 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                     <child>
                                       <object class="GtkScrolledWindow">
+                                        <property name="shadow-type">in</property>
                                         <property name="vexpand">1</property>
                                         <child>
                                           <object class="MyTextView" id="text3">
@@ -1891,9 +2145,6 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                     <child>
                                       <object class="GtkStatusbar" id="statusbar"/>
                                     </child>
@@ -2184,9 +2435,11 @@ microphone-sensitivity-medium-symbolic</property>
                         <property name="spacing">10</property>
                         <child>
                           <object class="GtkBox">
+                            <property name="halign">fill</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkBox" id="lockbox">
+                                <property name="halign">fill</property>
                                 <property name="hexpand">1</property>
                                 <property name="spacing">6</property>
                                 <child>
@@ -2263,6 +2516,9 @@ microphone-sensitivity-medium-symbolic</property>
                               <object class="GtkMenuButton">
                                 <property name="icon-name">view-more-symbolic</property>
                                 <property name="popover">new_style_menu</property>
+<!--
+                                <property name="menu-model">new_style_menu_model</property>
+-->
                               </object>
                             </child>
                           </object>
@@ -3097,6 +3353,10 @@ bad things might happen.</property>
             <accessibility>
               <relation type="label-for" target="open_popover_entry"/>
             </accessibility>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
+            </layout>
           </object>
         </child>
         <child>
@@ -3108,6 +3368,7 @@ bad things might happen.</property>
               <relation type="label-for" target="open_popover_textview"/>
             </accessibility>
             <layout>
+              <property name="left-attach">0</property>
               <property name="top-attach">1</property>
             </layout>
           </object>
@@ -3142,6 +3403,7 @@ bad things might happen.</property>
             </accessibility>
             <layout>
               <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3180,6 +3442,7 @@ bad things might happen.</property>
         </child>
         <child>
           <object class="GtkButton" id="open_popover_button">
+            <property name="halign">fill</property>
             <property name="label">_Open</property>
             <property name="use-underline">1</property>
             <property name="sensitive">0</property>
@@ -3228,7 +3491,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkLabel">
-        <property name="label">You&apos;re in too deep!</property>
+        <property name="label">You're in too deep!</property>
         <accessibility>
           <role type="static"/>
         </accessibility>
@@ -3239,6 +3502,7 @@ bad things might happen.</property>
     <property name="autohide">0</property>
     <child>
       <object class="GtkBox">
+        <property name="orientation">horizontal</property>
         <child>
           <object class="GtkLabel">
             <property name="label">Hidden gems:</property>
@@ -3258,246 +3522,222 @@ bad things might happen.</property>
       </object>
     </child>
   </object>
-  <object class="GtkPopover" id="new_style_menu">
+  <object class="GtkPopoverMenu" id="new_style_menu">
     <child>
-      <object class="GtkStack">
+      <object class="GtkBox">
+        <property name="name">main</property>
+        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">main</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="circular-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">printer-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.print</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">emblem-shared-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                        <property name="action-name">app.share</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="circular"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Open in New Window</property>
-                    <property name="action-name">app.open-in</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkBox">
-                    <style>
-                      <class name="inline-buttons"/>
-                    </style>
-                    <child>
-                      <object class="GtkLabel" id="cut_copy_paste_filler"/>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label">Edit</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-cut-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-copy-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkModelButton">
-                        <property name="icon">
-                          <object class="GThemedIcon">
-                            <property name="name">edit-paste-symbolic</property>
-                          </object>
-                        </property>
-                        <property name="iconic">1</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Pin</property>
-                    <property name="action-name">app.pin</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Select Labels…</property>
-                    <property name="action-name">app.labels</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Share…</property>
-                    <property name="action-name">app.share</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="menu-name">basement</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Large</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;large&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Medium</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;medium&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Small</property>
-                    <property name="action-name">app.size</property>
-                    <property name="action-target">&apos;small&apos;</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Move to Trash</property>
-                    <property name="action-name">win.delete</property>
-                    <property name="indicator-size-group">main-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkBox">
+            <property name="halign">fill</property>
+            <style>
+              <class name="circular-buttons"/>
+            </style>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">printer-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.print</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">emblem-shared-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="action-name">app.share</property>
+                <property name="hexpand">1</property>
+                <property name="halign">center</property>
+                <style>
+                  <class name="circular"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkStackPage">
-            <property name="name">basement</property>
-            <property name="child">
-              <object class="GtkBox">
-                <property name="orientation">vertical</property>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Basement</property>
-                    <property name="role">title</property>
-                    <property name="menu-name">main</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkSeparator"/>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Berk</property>
-                    <property name="action-name">app.berk</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Broni</property>
-                    <property name="action-name">app.broni</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">Drutt</property>
-                    <property name="action-name">app.drutt</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkModelButton">
-                    <property name="text">The Thing Upstairs</property>
-                    <property name="action-name">app.upstairs</property>
-                    <property name="indicator-size-group">basement-indicators</property>
-                  </object>
-                </child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Open in New Window</property>
+            <property name="action-name">app.open-in</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <style>
+              <class name="inline-buttons"/>
+            </style>
+            <child>
+              <object class="GtkLabel" id="cut_copy_paste_filler">
+            </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Edit</property>
+                <property name="xalign">0</property>
+                <property name="hexpand">1</property>
               </object>
-            </property>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-cut-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-copy-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkModelButton">
+                <property name="icon"><object class="GThemedIcon"><property name="name">edit-paste-symbolic</property></object></property>
+                <property name="iconic">1</property>
+                <property name="relief">none</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Pin</property>
+            <property name="action-name">app.pin</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Select Labels…</property>
+            <property name="action-name">app.labels</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Share…</property>
+            <property name="action-name">app.share</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="menu-name">basement</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Large</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'large'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Medium</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'medium'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Small</property>
+            <property name="action-name">app.size</property>
+            <property name="action-target">'small'</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Move to Trash</property>
+            <property name="action-name">win.delete</property>
+            <property name="indicator-size-group">main-indicators</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkBox">
+        <property name="name">basement</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Basement</property>
+            <property name="role">title</property>
+            <property name="menu-name">main</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Berk</property>
+            <property name="action-name">app.berk</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Broni</property>
+            <property name="action-name">app.broni</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">Drutt</property>
+            <property name="action-name">app.drutt</property>
+            <property name="indicator-size-group">basement-indicators</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="text">The Thing Upstairs</property>
+            <property name="action-name">app.upstairs</property>
+            <property name="indicator-size-group">basement-indicators</property>
           </object>
         </child>
       </object>
     </child>
   </object>
   <object class="GtkSizeGroup" id="main-indicators">
+    <property name="mode">horizontal</property>
     <widgets>
       <widget name="cut_copy_paste_filler"/>
     </widgets>
   </object>
-  <object class="GtkSizeGroup" id="basement-indicators"/>
+  <object class="GtkSizeGroup" id="basement-indicators">
+    <property name="mode">horizontal</property>
+  </object>
   <menu id="new_style_menu_model">
     <section>
       <attribute name="display-hint">circular-buttons</attribute>
@@ -3587,10 +3827,10 @@ bad things might happen.</property>
       </item>
     </section>
     <section>
-      <item>
-        <attribute name="label" translatable="yes">Move to Trash</attribute>
-        <attribute name="action">win.delete</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Move to Trash</attribute>
+          <attribute name="action">win.delete</attribute>
+        </item>
     </section>
   </menu>
   <menu id="new_style_context_menu_model">
@@ -3704,7 +3944,7 @@ bad things might happen.</property>
       </section>
       <section>
         <submenu>
-          <attribute name="label" translatable="yes">C_hecks</attribute>
+          <attribute name="label" translatable="yes">Checks &amp; Radios</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">Check</attribute>
@@ -3728,9 +3968,6 @@ bad things might happen.</property>
               <attribute name="hidden-when">action-missing</attribute>
             </item>
           </section>
-        </submenu>
-        <submenu>
-          <attribute name="label" translatable="yes">_Radios</attribute>
           <section>
             <item>
               <attribute name="label" translatable="yes">Radio</attribute>
@@ -3781,13 +4018,14 @@ bad things might happen.</property>
           <attribute name="action">win.background</attribute>
         </item>
       </section>
+
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Help</attribute>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">About</attribute>
+          <attribute name="action">app.about</attribute>
+        </item>
     </submenu>
   </menu>
 </interface>

docs/reference/gdk/gdk4-sections.txt

@@ -192,8 +192,8 @@ gdk_surface_is_destroyed
 gdk_surface_is_visible
 gdk_surface_is_viewable
 gdk_surface_get_state
-gdk_surface_minimize
-gdk_surface_unminimize
+gdk_surface_iconify
+gdk_surface_deiconify
 gdk_surface_stick
 gdk_surface_unstick
 gdk_surface_maximize
@@ -544,6 +544,8 @@ GdkSeatCapabilities
 GdkGrabStatus
 GdkSeatGrabPrepareFunc
 gdk_seat_get_display
+gdk_seat_grab
+gdk_seat_ungrab
 gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
@@ -787,6 +789,8 @@ gdk_drop_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkx.h</INCLUDE>
+<TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_SURFACE_XID
 GDK_DISPLAY_XDISPLAY
@@ -937,6 +941,8 @@ gdk_surface_impl_x11_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>gdk/gdkwayland.h</INCLUDE>
+<TITLE>Wayland Interaction</TITLE>
 <FILE>wayland_interaction</FILE>
 gdk_wayland_seat_get_wl_seat
 gdk_wayland_device_get_wl_keyboard

docs/reference/gsk/gsk4-sections.txt

@@ -30,7 +30,6 @@ GskRenderNodeType
 gsk_render_node_get_node_type
 gsk_render_node_draw
 GskSerializationError
-GskParseErrorFunc
 gsk_render_node_serialize
 gsk_render_node_deserialize
 gsk_render_node_write_to_file

docs/reference/gtk/actions.xml

@@ -314,8 +314,8 @@
       be connected to an action just by setting the ::action-name
       property. If the action has a parameter, you will also need
       to set the ::action-target property.
-      Widgets that implement GtkActionable include GtkSwitch, GtkButton,
-      and their respective subclasses.
+      Widgets that implement GtkAction include GtkSwitch, GtkButton,
+      GtkMenuItem and their respective subclasses.
     </para>
 
     <para>

docs/reference/gtk/building.sgml

@@ -76,10 +76,10 @@ How to compile GTK itself
     </para>
     <para>
       Several environment variables are useful to pass to set before
-      running <application>meson</application>. <envar>CPPFLAGS</envar>
-      contains options to pass to the C compiler, and is used to tell
-      the compiler where to look for include files. The <envar>LDFLAGS</envar>
-      variable is used in a similar fashion for the linker. Finally the
+      running configure. <envar>CPPFLAGS</envar> contains options to
+      pass to the C compiler, and is used to tell the compiler where
+      to look for include files. The <envar>LDFLAGS</envar> variable
+      is used in a similar fashion for the linker. Finally the
       <envar>PKG_CONFIG_PATH</envar> environment variable contains
       a search path that <command>pkg-config</command> (see below)
       uses when looking for files describing how to compile
@@ -106,61 +106,6 @@ How to compile GTK itself
       export LD_LIBRARY_PATH PATH
     </programlisting>
   </refsect1>
-
-  <refsect1 id="build-types">
-    <title>Build types</title>
-
-    <para>Meson has different build types, exposed by the <literal>buildtype</literal>
-    configuration option. GTK enables and disables functionality depending on
-    the build type used when calling <application>meson</application> to
-    configure the build.</para>
-
-    <formalpara>
-      <title><systemitem>debug</systemitem> and <systemitem>debugoptimized</systemitem></title>
-
-      <para>
-        GTK will enable debugging code paths in both the
-        <literal>debug</literal> and <literal>debugoptimized</literal>
-        build types. Builds with <literal>buildtype</literal> set
-        to <literal>debug</literal> will additionally enable
-        consistency checks on the internal state of the toolkit.
-      </para>
-
-      <para>
-        It is recommended to use the <literal>debug</literal> or
-        <literal>debugoptimized</literal> build types when developing
-        GTK itself. Additionally, <literal>debug</literal> builds of
-        GTK are recommended for profiling and debugging GTK applications,
-        as they include additional validation of the internal state.
-      </para>
-
-      <para>
-        The <literal>debugoptimized</literal> build type is the
-        default for GTK if no build type is specified when calling
-        <application>meson</application>
-      </para>
-    </formalpara>
-
-    <formalpara>
-      <title><systemitem>release</systemitem></title>
-
-      <para>
-        The <literal>release</literal> build type will disable
-        debugging code paths and additional run time safeties, like
-        checked casts for object instances.
-      </para>
-    </formalpara>
-
-    <para>
-      The <literal>plain</literal> build type provided by Meson
-      should only be used when packaging GTK, and it's expected
-      that packagers will provide their own compiler flags when
-      building GTK. See the previous section for the list of
-      environment variables to be used to define compiler and
-      linker flags.
-    </para>
-  </refsect1>
-
   <refsect1 id="dependencies">
     <title>Dependencies</title>
     <para>
@@ -338,181 +283,184 @@ How to compile GTK itself
       See <xref linkend="gtk-resources"/> for more information.
     </para>
   </refsect1>
-
-  <refsect1 id="extra-configuration-options">
-    <title>Extra Configuration Options</title>
-
-    <para>
-      In addition to the normal options provided by Meson, GTK defines
-      various arguments that modify what should be built.
-
-      <cmdsynopsis>
-        <command>meson</command>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dx11-backend=true</arg>
-          <arg choice="plain">-Dx11-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dwayland-backend=true</arg>
-          <arg choice="plain">-Dwayland-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dbroadway-backend=true</arg>
-          <arg choice="plain">-Dbroadway-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dwin32-backend=true</arg>
-          <arg choice="plain">-Dwin32-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dquartz-backend=true</arg>
-          <arg choice="plain">-Dquartz-backend=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dmedia=gstreamer</arg>
-          <arg choice="plain">-Dmedia=ffmpeg</arg>
-          <arg choice="plain">-Dmedia=all</arg>
-          <arg choice="plain">-Dmedia=none</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dvulkan=yes</arg>
-          <arg choice="plain">-Dvulkan=no</arg>
-          <arg choice="plain">-Dvulkan=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dxinerama=yes</arg>
-          <arg choice="plain">-Dxinerama=no</arg>
-          <arg choice="plain">-Dxinerama=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dcloudproviders=true</arg>
-          <arg choice="plain">-Dcloudproviders=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dprint-backends=all</arg>
-          <arg choice="plain">-Dprint-backends=none</arg>
-          <arg choice="plain">-Dprint-backends=cups,lpr,...</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dcolord=yes</arg>
-          <arg choice="plain">-Dcolord=no</arg>
-          <arg choice="plain">-Dcolord=auto</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dgtk_doc=true</arg>
-          <arg choice="plain">-Dgtk_doc=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dman-pages=true</arg>
-          <arg choice="plain">-Dman-pages=false</arg>
-        </group>
-        <sbr/>
-        <group>
-          <arg choice="plain">-Dintrospection=true</arg>
-          <arg choice="plain">-Dintrospection=false</arg>
-        </group>
-      </cmdsynopsis>
-    </para>
-
-    <formalpara>
-      <title><systemitem>xinerama</systemitem></title>
+      <refsect1 id="extra-configuration-options">
+      <title>Extra Configuration Options</title>
 
       <para>
-        By default GTK will try to link against the Xinerama libraries
-        if they are found. This options can be used to explicitly control
-        whether Xinerama should be used.
+        In addition to the normal options provided by Meson, GTK defines
+        various arguments that modify what should be built.
+
+        <cmdsynopsis>
+          <command>meson</command>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dx11-backend=true</arg>
+            <arg choice="plain">-Dx11-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwayland-backend=true</arg>
+            <arg choice="plain">-Dwayland-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dbroadway-backend=true</arg>
+            <arg choice="plain">-Dbroadway-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwin32-backend=true</arg>
+            <arg choice="plain">-Dwin32-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dquartz-backend=true</arg>
+            <arg choice="plain">-Dquartz-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dmedia=gstreamer</arg>
+            <arg choice="plain">-Dmedia=ffmpeg</arg>
+            <arg choice="plain">-Dmedia=all</arg>
+            <arg choice="plain">-Dmedia=none</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dvulkan=yes</arg>
+            <arg choice="plain">-Dvulkan=no</arg>
+            <arg choice="plain">-Dvulkan=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dxinerama=yes</arg>
+            <arg choice="plain">-Dxinerama=no</arg>
+            <arg choice="plain">-Dxinerama=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dcloudproviders=true</arg>
+            <arg choice="plain">-Dcloudproviders=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dprint-backends=all</arg>
+            <arg choice="plain">-Dprint-backends=none</arg>
+            <arg choice="plain">-Dprint-backends=cups,lpr,...</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dcolord=yes</arg>
+            <arg choice="plain">-Dcolord=no</arg>
+            <arg choice="plain">-Dcolord=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dgtk_doc=true</arg>
+            <arg choice="plain">-Dgtk_doc=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dman-pages=true</arg>
+            <arg choice="plain">-Dman-pages=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dintrospection=true</arg>
+            <arg choice="plain">-Dintrospection=false</arg>
+          </group>
+        </cmdsynopsis>
       </para>
-    </formalpara>
 
-    <formalpara>
-      <title><systemitem>gtk_doc</systemitem> and
-        <systemitem>man-pages</systemitem></title>
+      <formalpara>
+        <title><systemitem>xinerama</systemitem></title>
 
-      <para>
-        The <application>gtk-doc</application> package is
-        used to generate the reference documentation included
-        with GTK. By default support for <application>gtk-doc</application>
-        is disabled because it requires various extra dependencies
-        to be installed. If you have
-        <application>gtk-doc</application> installed and
-        are modifying GTK, you may want to enable
-        <application>gtk-doc</application> support by passing
-        in <systemitem>gtk_doc</systemitem>.
-      </para>
-      <para>
-        Additionally, some tools provided by GTK have their own
-        manual pages generated using a similar set of dependencies;
-        if you have <application>xsltproc</application> then you
-        can generate manual pages by passing <systemitem>man-pages</systemitem>
-        when configuring the build.
-      </para>
-    </formalpara>
+        <para>
+          By default GTK will try to link against the Xinerama libraries
+          if they are found. This options can be used to explicitly control
+          whether Xinerama should be used.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>print-backends</systemitem></title>
+      <formalpara>
+        <title><systemitem>gtk_doc</systemitem> and
+          <systemitem>man-pages</systemitem></title>
 
-      <para>
-        By default, GTK will try to build various print backends if
-        their dependencies are found. This option can be used to
-        explicitly control which print backends should be built.
-      </para>
-    </formalpara>
+        <para>
+          The <application>gtk-doc</application> package is
+          used to generate the reference documentation included
+          with GTK. By default support for <application>gtk-doc</application>
+          is disabled because it requires various extra dependencies
+          to be installed. If you have
+          <application>gtk-doc</application> installed and
+          are modifying GTK, you may want to enable
+          <application>gtk-doc</application> support by passing
+          in <systemitem>gtk_doc</systemitem>.
+        </para>
+        <para>
+          Additionally, some tools provided by GTK have their own
+          manual pages generated using a similar set of dependencies;
+          if you have <application>xsltproc</application> then you
+          can generate manual pages by passing <systemitem>man-pages</systemitem>
+          when configuring the build.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>x11-backend</systemitem>,
-        <systemitem>win32-backend</systemitem>,
-        <systemitem>quartz-backend</systemitem>,
-        <systemitem>broadway-backend</systemitem> and
-        <systemitem>wayland-backend</systemitem></title>
+      <formalpara>
+        <title><systemitem>print-backends</systemitem></title>
 
-      <para>
-        Enable specific backends for GDK.  If none of these options
-        are given, the Wayland backend will be enabled by default,
-        if the platform is Linux; the X11 backend will also be enabled
-        by default, unless the platform is Windows, in which case the
-        default is win32, or the platform is macOS, in which case the
-        default is quartz. If any backend is explicitly enabled or disabled,
-        no other platform will be enabled automatically.
-      </para>
-    </formalpara>
+        <para>
+          By default, GTK will try to build various print backends if
+          their dependencies are found. This option can be used to
+          explicitly control which print backends should be built.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>introspection</systemitem></title>
+      <formalpara>
+        <title><systemitem>x11-backend</systemitem>,
+          <systemitem>win32-backend</systemitem>,
+          <systemitem>quartz-backend</systemitem>,
+          <systemitem>broadway-backend</systemitem> and
+          <systemitem>wayland-backend</systemitem></title>
 
-      <para>
-        Allows to disable building introspection support. This is option
-        is mainly useful for shortening turnaround times on developer
-        systems. Installed builds of GTK should always have introspection
-        support.
-      </para>
-    </formalpara>
+        <para>
+          Enable specific backends for GDK.  If none of these options
+          are given, the Wayland backend will be enabled by default,
+          if the platform is Linux; the X11 backend will also be enabled
+          by default, unless the platform is Windows, in which case the
+          default is win32, or the platform is macOS, in which case the
+          default is quartz. If any backend is explicitly enabled or disabled,
+          no other platform will be enabled automatically.
+        </para>
+      </formalpara>
 
-    <formalpara>
-      <title><systemitem>build-tests</systemitem>,
-             <systemitem>install-tests</systemitem>,
-             <systemitem>demos</systemitem></title>
+      <formalpara>
+        <title><systemitem>introspection</systemitem></title>
 
-      <para>
-        By default, GTK will build quite a few tests and demos.
-        While these are useful on a developer system, they are not
-        needed when GTK is built e.g. for a flatpak runtime. These
-        options allow to disable building tests and demos.
-      </para>
-    </formalpara>
+        <para>
+          Allows to disable building introspection support. This is option
+          is mainly useful for shortening turnaround times on developer
+          systems. Installed builds of GTK should always have introspection
+          support.
+        </para>
+      </formalpara>
 
-  </refsect1>
+      <formalpara>
+        <title><systemitem>build-tests</systemitem>,
+               <systemitem>install-tests</systemitem>,
+               <systemitem>demos</systemitem></title>
+
+        <para>
+          By default, GTK will build quite a few tests and demos.
+          While these are useful on a developer system, they are not
+          needed when GTK is built e.g. for a flatpak runtime. These
+          options allow to disable building tests and demos.
+        </para>
+      </formalpara>
+
+    </refsect1>
 
 </refentry>
+
+<!-- Local Variables: -->
+<!-- sgml-parent-document: ("gtk-docs.sgml" "chapter" "refentry")  -->
+<!-- End: -->

docs/reference/gtk/drawing-model.xml

@@ -224,3 +224,10 @@
   </refsect1>
 
 </refentry>
+
+<!--
+Local variables:
+mode: xml
+sgml-parent-document: ("gtk-docs.sgml" "book" "part" "refentry")
+End:
+-->

docs/reference/gtk/glossary.xml

@@ -364,3 +364,10 @@
     </glossdef>
   </glossentry>
 </glossary>
+
+<!--
+Local variables:
+mode: sgml
+sgml-parent-document: ("gtk-docs.sgml" "book" "glossary")
+End:
+-->

docs/reference/gtk/gtk4-docs.xml

@@ -22,8 +22,8 @@
     <title>GTK Overview</title>
     <xi:include href="overview.xml"/>
     <xi:include href="xml/getting_started.xml"/>
-    <xi:include href="resources.xml" />
-    <xi:include href="xml/question_index.xml" />
+    <xi:include href="resources.sgml" />
+    <xi:include href="xml/question_index.sgml" />
     <xi:include href="xml/drawing-model.xml" />
     <xi:include href="xml/input-handling.xml" />
     <xi:include href="xml/actions.xml" />
@@ -49,14 +49,9 @@
       <xi:include href="xml/gtkmaplistmodel.xml" />
       <xi:include href="xml/gtkslicelistmodel.xml" />
       <xi:include href="xml/gtksortlistmodel.xml" />
-      <xi:include href="xml/gtkselectionmodel.xml" />
-      <xi:include href="xml/gtknoselection.xml" />
-      <xi:include href="xml/gtksingleselection.xml" />
-    </chapter>
-
-    <chapter id="Trees">
-      <xi:include href="xml/gtktreelistrow.xml" />
       <xi:include href="xml/gtktreelistmodel.xml" />
+      <xi:include href="xml/gtkselectionmodel.xml" />
+      <xi:include href="xml/gtksingleselection.xml" />
     </chapter>
 
     <chapter id="Application">
@@ -70,13 +65,11 @@
       <title>Interface builder</title>
       <xi:include href="xml/gtkbuilder.xml" />
       <xi:include href="xml/gtkbuildable.xml" />
-      <xi:include href="xml/gtkbuilderscope.xml" />
     </chapter>
 
     <chapter id="WindowWidgets">
       <title>Windows</title>
       <xi:include href="xml/gtkroot.xml" />
-      <xi:include href="xml/gtknative.xml" />
       <xi:include href="xml/gtkwindow.xml" />
       <xi:include href="xml/gtkdialog.xml" />
       <xi:include href="xml/gtkmessagedialog.xml" />
@@ -155,6 +148,7 @@
       <xi:include href="xml/gtkscalebutton.xml" />
       <xi:include href="xml/gtkvolumebutton.xml" />
       <xi:include href="xml/gtklockbutton.xml" />
+      <xi:include href="xml/gtkmodelbutton.xml" />
     </chapter>
 
     <chapter id="NumericEntry">
@@ -173,7 +167,7 @@
 
     <chapter id="TextWidgetObjects">
       <title>Multiline Text Editor</title>
-      <xi:include href="xml/text_widget.xml" />
+      <xi:include href="xml/text_widget.sgml" />
       <xi:include href="xml/gtktextiter.xml" />
       <xi:include href="xml/gtktextmark.xml" />
       <xi:include href="xml/gtktextbuffer.xml" />
@@ -184,7 +178,7 @@
 
     <chapter id="TreeWidgetObjects">
       <title>Tree, List and Icon Grid Widgets</title>
-      <xi:include href="xml/tree_widget.xml" />
+      <xi:include href="xml/tree_widget.sgml" />
       <xi:include href="xml/gtktreemodel.xml" />
       <xi:include href="xml/gtktreeselection.xml" />
       <xi:include href="xml/gtktreeviewcolumn.xml" />
@@ -217,6 +211,12 @@
       <title>Menus, Combo Box, Toolbar</title>
       <xi:include href="xml/gtkcombobox.xml" />
       <xi:include href="xml/gtkcomboboxtext.xml" />
+      <xi:include href="xml/gtkmenu.xml" />
+      <xi:include href="xml/gtkmenubar.xml" />
+      <xi:include href="xml/gtkmenuitem.xml" />
+      <xi:include href="xml/gtkradiomenuitem.xml" />
+      <xi:include href="xml/gtkcheckmenuitem.xml" />
+      <xi:include href="xml/gtkseparatormenuitem.xml" />
       <xi:include href="xml/gtktoolshell.xml" />
       <xi:include href="xml/gtktoolbar.xml" />
       <xi:include href="xml/gtktoolitem.xml" />
@@ -305,6 +305,7 @@
       <xi:include href="xml/gtkwidget.xml" />
       <xi:include href="xml/gtkcontainer.xml" />
       <xi:include href="xml/gtkbin.xml" />
+      <xi:include href="xml/gtkmenushell.xml" />
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
       <xi:include href="xml/gtknativedialog.xml" />
@@ -405,12 +406,12 @@
 
   <part id="platform-support">
     <title>GTK Platform Support</title>
-    <xi:include href="building.xml" />
-    <xi:include href="xml/compiling.xml" />
-    <xi:include href="running.xml" />
-    <xi:include href="x11.xml" />
-    <xi:include href="windows.xml" />
-    <xi:include href="osx.xml" />
+    <xi:include href="building.sgml" />
+    <xi:include href="xml/compiling.sgml" />
+    <xi:include href="running.sgml" />
+    <xi:include href="x11.sgml" />
+    <xi:include href="windows.sgml" />
+    <xi:include href="osx.sgml" />
     <xi:include href="broadway.xml" />
     <xi:include href="wayland.xml" />
   </part>

docs/reference/gtk/gtk4-sections.txt

@@ -213,6 +213,7 @@ gtk_adjustment_get_type
 <TITLE>GtkAssistant</TITLE>
 GtkAssistant
 GtkAssistantPage
+GtkAssistantClass
 gtk_assistant_new
 gtk_assistant_get_page
 gtk_assistant_get_pages
@@ -257,6 +258,7 @@ gtk_assistant_get_type
 <FILE>gtkaspectframe</FILE>
 <TITLE>GtkAspectFrame</TITLE>
 GtkAspectFrame
+GtkAspectFrameClass
 gtk_aspect_frame_new
 gtk_aspect_frame_set
 <SUBSECTION Standard>
@@ -339,34 +341,11 @@ GTK_CENTER_BOX_GET_CLASS
 gtk_center_box_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkcenterlayout</FILE>
-<TITLE>GtkCenterLayout</TITLE>
-GtkCenterLayout
-gtk_center_layout_new
-gtk_center_layout_set_start_widget
-gtk_center_layout_set_center_widget
-gtk_center_layout_set_end_widget
-gtk_center_layout_get_start_widget
-gtk_center_layout_get_center_widget
-gtk_center_layout_get_end_widget
-gtk_center_layout_set_baseline_position
-gtk_center_layout_get_baseline_position
-<SUBSECTION Private>
-GTK_TYPE_CENTER_layout
-GTK_CENTER_LAYOUT
-GTK_CENTER_LAYOUT_CLASS
-GTK_IS_CENTER_LAYOUT
-GTK_IS_CENTER_LAYOUT_CLASS
-GTK_CENTER_LAYOUT_GET_CLASS
-<SUBSECTION Private>
-gtk_center_layout_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtklistbox</FILE>
 <TITLE>GtkListBox</TITLE>
 GtkListBox
+GtkListBoxClass
 GtkListBoxRow
 GtkListBoxRowClass
 GtkListBoxFilterFunc
@@ -462,23 +441,12 @@ GTK_TYPE_SELECTION_MODEL
 gtk_selection_model_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtknoselection</FILE>
-<TITLE>GtkNoSelection</TITLE>
-GtkNoSelection
-gtk_no_selection_new
-gtk_no_selection_get_model
-<SUBSECTION Private>
-gtk_no_selection_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtksingleselection</FILE>
 <TITLE>GtkSingleSelection</TITLE>
 GtkSingleSelection
 GTK_INVALID_LIST_POSITION
 gtk_single_selection_new
-gtk_single_selection_get_model
 gtk_single_selection_get_selected
 gtk_single_selection_set_selected
 gtk_single_selection_get_selected_item
@@ -513,41 +481,19 @@ GTK_BUILDABLE_CLASS
 GTK_BUILDABLE_GET_IFACE
 </SECTION>
 
-<SECTION>
-<FILE>gtkbuilderscope</FILE>
-<TITLE>GtkBuilderScope</TITLE>
-gtk_builder_cscope_new
-gtk_builder_cscope_add_callback_symbol
-gtk_builder_cscope_add_callback_symbols
-gtk_builder_cscope_lookup_callback_symbol
-<SUBSECTION Standard>
-GTK_BUILDER_SCOPE
-GTK_IS_BUILDER_SCOPE
-GTK_TYPE_BUILDER_SCOPE
-GTK_BUILDER_SCOPE_INTERFACE
-GTK_IS_BUILDER_SCOPE_INTERFACE
-GTK_BUILDER_SCOPE_GET_INTERFACE
-GTK_BUILDER_CSCOPE
-GTK_IS_BUILDER_CSCOPE
-GTK_TYPE_BUILDER_CSCOPE
-GTK_BUILDER_CSCOPE_CLASS
-GTK_IS_BUILDER_CSCOPE_CLASS
-GTK_BUILDER_CSCOPE_GET_CLASS
-<SUBSECTION Private>
-gtk_builder_scope_get_type
-gtk_builder_cscope_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkbuilder</FILE>
 <TITLE>GtkBuilder</TITLE>
 GtkBuilder
+GtkBuilderConnectFunc
 GtkBuilderError
 gtk_builder_new
 gtk_builder_new_from_file
 gtk_builder_new_from_resource
 gtk_builder_new_from_string
-gtk_builder_create_closure
+gtk_builder_add_callback_symbol
+gtk_builder_add_callback_symbols
+gtk_builder_lookup_callback_symbol
 gtk_builder_add_from_file
 gtk_builder_add_from_resource
 gtk_builder_add_from_string
@@ -558,12 +504,12 @@ gtk_builder_extend_with_template
 gtk_builder_get_object
 gtk_builder_get_objects
 gtk_builder_expose_object
-gtk_builder_set_current_object
-gtk_builder_get_current_object
-gtk_builder_set_scope
-gtk_builder_get_scope
+gtk_builder_connect_signals
+gtk_builder_connect_signals_full
 gtk_builder_set_translation_domain
 gtk_builder_get_translation_domain
+gtk_builder_set_application
+gtk_builder_get_application
 gtk_builder_get_type_from_name
 gtk_builder_value_from_string
 gtk_builder_value_from_string_type
@@ -580,6 +526,7 @@ GTK_BUILDER_GET_CLASS
 <SUBSECTION Private>
 gtk_builder_get_type
 gtk_builder_error_quark
+GtkBuilderPrivate
 </SECTION>
 
 <SECTION>
@@ -674,6 +621,34 @@ GTK_CHECK_BUTTON_GET_CLASS
 gtk_check_button_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkcheckmenuitem</FILE>
+GtkCheckMenuItem
+GtkCheckMenuItemClass
+<TITLE>GtkCheckMenuItem</TITLE>
+gtk_check_menu_item_new
+gtk_check_menu_item_new_with_label
+gtk_check_menu_item_new_with_mnemonic
+gtk_check_menu_item_get_active
+gtk_check_menu_item_set_active
+gtk_check_menu_item_toggled
+gtk_check_menu_item_get_inconsistent
+gtk_check_menu_item_set_inconsistent
+gtk_check_menu_item_set_draw_as_radio
+gtk_check_menu_item_get_draw_as_radio
+
+<SUBSECTION Standard>
+GTK_CHECK_MENU_ITEM
+GTK_IS_CHECK_MENU_ITEM
+GTK_TYPE_CHECK_MENU_ITEM
+GTK_CHECK_MENU_ITEM_CLASS
+GTK_IS_CHECK_MENU_ITEM_CLASS
+GTK_CHECK_MENU_ITEM_GET_CLASS
+<SUBSECTION Private>
+GtkCheckMenuItemPrivate
+gtk_check_menu_item_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkcolorbutton</FILE>
 <TITLE>GtkColorButton</TITLE>
@@ -872,8 +847,6 @@ gtk_editable_get_width_chars
 gtk_editable_set_width_chars
 gtk_editable_get_max_width_chars
 gtk_editable_set_max_width_chars
-gtk_editable_get_enable_undo
-gtk_editable_set_enable_undo
 <SUBSECTION>
 gtk_editable_install_properties
 gtk_editable_init_delegate
@@ -1101,6 +1074,7 @@ gtk_entry_completion_get_type
 <FILE>gtkexpander</FILE>
 <TITLE>GtkExpander</TITLE>
 GtkExpander
+GtkExpanderClass
 gtk_expander_new
 gtk_expander_new_with_mnemonic
 gtk_expander_set_expanded
@@ -1247,6 +1221,7 @@ GtkFileChooserDialogPrivate
 <FILE>gtkfilechooserwidget</FILE>
 <TITLE>GtkFileChooserWidget</TITLE>
 GtkFileChooserWidget
+GtkFileChooserWidgetClass
 gtk_file_chooser_widget_new
 <SUBSECTION Standard>
 GTK_FILE_CHOOSER_WIDGET
@@ -1264,6 +1239,7 @@ GtkFileChooserWidgetPrivate
 <FILE>gtkfilechooserbutton</FILE>
 <TITLE>GtkFileChooserButton</TITLE>
 GtkFileChooserButton
+GtkFileChooserButtonClass
 gtk_file_chooser_button_new
 gtk_file_chooser_button_new_with_dialog
 gtk_file_chooser_button_get_title
@@ -1439,6 +1415,7 @@ gtk_font_chooser_get_type
 <FILE>gtkfontchooserwidget</FILE>
 <TITLE>GtkFontChooserWidget</TITLE>
 GtkFontChooserWidget
+GtkFontChooserWidgetClass
 gtk_font_chooser_widget_new
 
 <SUBSECTION Standard>
@@ -1458,6 +1435,7 @@ gtk_font_chooser_widget_get_type
 <FILE>gtkfontchooserdialog</FILE>
 <TITLE>GtkFontChooserDialog</TITLE>
 GtkFontChooserDialog
+GtkFontChooserDialogClass
 gtk_font_chooser_dialog_new
 
 <SUBSECTION Standard>
@@ -1706,8 +1684,8 @@ gtk_label_set_yalign
 gtk_label_set_ellipsize
 gtk_label_set_width_chars
 gtk_label_set_max_width_chars
-gtk_label_set_wrap
-gtk_label_set_wrap_mode
+gtk_label_set_line_wrap
+gtk_label_set_line_wrap_mode
 gtk_label_set_lines
 gtk_label_get_layout_offsets
 gtk_label_get_mnemonic_keyval
@@ -1727,8 +1705,8 @@ gtk_label_get_width_chars
 gtk_label_get_max_width_chars
 gtk_label_get_label
 gtk_label_get_layout
-gtk_label_get_wrap
-gtk_label_get_wrap_mode
+gtk_label_get_line_wrap
+gtk_label_get_line_wrap_mode
 gtk_label_get_lines
 gtk_label_get_mnemonic_widget
 gtk_label_get_selection_bounds
@@ -1762,6 +1740,7 @@ GtkLabelSelectionInfo
 <FILE>gtklinkbutton</FILE>
 <TITLE>GtkLinkButton</TITLE>
 GtkLinkButton
+GtkLinkButtonClass
 gtk_link_button_new
 gtk_link_button_new_with_label
 gtk_link_button_get_uri
@@ -1802,15 +1781,78 @@ GTK_MAP_LIST_MODEL_GET_CLASS
 gtk_map_list_model_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkmenu</FILE>
+<TITLE>GtkMenu</TITLE>
+GtkMenu
+gtk_menu_new
+gtk_menu_new_from_model
+gtk_menu_reorder_child
+gtk_menu_popup_at_rect
+gtk_menu_popup_at_widget
+gtk_menu_popup_at_pointer
+gtk_menu_set_accel_group
+gtk_menu_get_accel_group
+gtk_menu_set_accel_path
+gtk_menu_get_accel_path
+gtk_menu_set_monitor
+gtk_menu_get_monitor
+gtk_menu_place_on_monitor
+gtk_menu_set_reserve_toggle_size
+gtk_menu_get_reserve_toggle_size
+<SUBSECTION>
+gtk_menu_popdown
+gtk_menu_reposition
+gtk_menu_get_active
+gtk_menu_set_active
+gtk_menu_attach_to_widget
+gtk_menu_detach
+gtk_menu_get_attach_widget
+gtk_menu_get_for_attach_widget
+GtkMenuDetachFunc
+<SUBSECTION Standard>
+GTK_MENU
+GTK_IS_MENU
+GTK_TYPE_MENU
+GTK_MENU_CLASS
+GTK_IS_MENU_CLASS
+GTK_MENU_GET_CLASS
+<SUBSECTION Private>
+GtkMenuPrivate
+gtk_menu_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkmenubar</FILE>
+<TITLE>GtkMenuBar</TITLE>
+GtkMenuBar
+gtk_menu_bar_new
+gtk_menu_bar_new_from_model
+<SUBSECTION Standard>
+GTK_MENU_BAR
+GTK_IS_MENU_BAR
+GTK_TYPE_MENU_BAR
+GTK_MENU_BAR_CLASS
+GTK_IS_MENU_BAR_CLASS
+GTK_MENU_BAR_GET_CLASS
+<SUBSECTION Private>
+GtkMenuBarPrivate
+gtk_menu_bar_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkmenubutton</FILE>
 <TITLE>GtkMenuButton</TITLE>
 GtkMenuButton
 gtk_menu_button_new
+gtk_menu_button_set_popup
+gtk_menu_button_get_popup
 gtk_menu_button_set_popover
 gtk_menu_button_get_popover
 gtk_menu_button_set_menu_model
 gtk_menu_button_get_menu_model
+gtk_menu_button_set_use_popover
+gtk_menu_button_get_use_popover
 GtkArrowType
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
@@ -1824,8 +1866,6 @@ gtk_menu_button_set_relief
 gtk_menu_button_get_relief
 gtk_menu_button_popup
 gtk_menu_button_popdown
-GtkMenuButtonCreatePopupFunc
-gtk_menu_button_set_create_popup_func
 <SUBSECTION Standard>
 GTK_TYPE_MENU_BUTTON
 GTK_MENU_BUTTON
@@ -1838,6 +1878,72 @@ GtkMenuButtonPrivate
 gtk_menu_button_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkmenuitem</FILE>
+<TITLE>GtkMenuItem</TITLE>
+GtkMenuItem
+GtkMenuItemClass
+gtk_menu_item_new
+gtk_menu_item_new_with_label
+gtk_menu_item_new_with_mnemonic
+gtk_menu_item_get_label
+gtk_menu_item_set_label
+gtk_menu_item_get_use_underline
+gtk_menu_item_set_use_underline
+gtk_menu_item_set_submenu
+gtk_menu_item_get_submenu
+gtk_menu_item_set_accel_path
+gtk_menu_item_get_accel_path
+gtk_menu_item_select
+gtk_menu_item_deselect
+gtk_menu_item_activate
+gtk_menu_item_toggle_size_request
+gtk_menu_item_toggle_size_allocate
+gtk_menu_item_get_reserve_indicator
+gtk_menu_item_set_reserve_indicator
+<SUBSECTION Standard>
+GTK_MENU_ITEM
+GTK_IS_MENU_ITEM
+GTK_TYPE_MENU_ITEM
+GTK_MENU_ITEM_CLASS
+GTK_IS_MENU_ITEM_CLASS
+GTK_MENU_ITEM_GET_CLASS
+<SUBSECTION Private>
+GtkMenuItemPrivate
+gtk_menu_item_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkmenushell</FILE>
+<TITLE>GtkMenuShell</TITLE>
+GtkMenuShell
+gtk_menu_shell_append
+gtk_menu_shell_prepend
+gtk_menu_shell_insert
+gtk_menu_shell_deactivate
+gtk_menu_shell_select_item
+gtk_menu_shell_select_first
+gtk_menu_shell_deselect
+gtk_menu_shell_activate_item
+gtk_menu_shell_cancel
+gtk_menu_shell_set_take_focus
+gtk_menu_shell_get_take_focus
+gtk_menu_shell_get_selected_item
+gtk_menu_shell_get_parent_shell
+gtk_menu_shell_bind_model
+GtkMenuDirectionType
+<SUBSECTION Standard>
+GTK_MENU_SHELL
+GTK_IS_MENU_SHELL
+GTK_TYPE_MENU_SHELL
+GTK_MENU_SHELL_CLASS
+GTK_IS_MENU_SHELL_CLASS
+GTK_MENU_SHELL_GET_CLASS
+<SUBSECTION Private>
+GtkMenuShellPrivate
+gtk_menu_shell_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkmessagedialog</FILE>
 <TITLE>GtkMessageDialog</TITLE>
@@ -2100,6 +2206,31 @@ GtkRadioButtonPrivate
 gtk_radio_button_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkradiomenuitem</FILE>
+<TITLE>GtkRadioMenuItem</TITLE>
+GtkRadioMenuItem
+gtk_radio_menu_item_new
+gtk_radio_menu_item_new_with_label
+gtk_radio_menu_item_new_with_mnemonic
+gtk_radio_menu_item_new_from_widget
+gtk_radio_menu_item_new_with_label_from_widget
+gtk_radio_menu_item_new_with_mnemonic_from_widget
+gtk_radio_menu_item_set_group
+gtk_radio_menu_item_get_group
+gtk_radio_menu_item_join_group
+<SUBSECTION Standard>
+GTK_RADIO_MENU_ITEM
+GTK_IS_RADIO_MENU_ITEM
+GTK_TYPE_RADIO_MENU_ITEM
+GTK_RADIO_MENU_ITEM_CLASS
+GTK_IS_RADIO_MENU_ITEM_CLASS
+GTK_RADIO_MENU_ITEM_GET_CLASS
+<SUBSECTION Private>
+GtkRadioMenuItemPrivate
+gtk_radio_menu_item_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkrange</FILE>
 <TITLE>GtkRange</TITLE>
@@ -2301,6 +2432,7 @@ gtk_scrollbar_get_type
 <FILE>gtkscrolledwindow</FILE>
 <TITLE>GtkScrolledWindow</TITLE>
 GtkScrolledWindow
+GtkScrolledWindowClass
 gtk_scrolled_window_new
 gtk_scrolled_window_get_hadjustment
 gtk_scrolled_window_set_hadjustment
@@ -2352,6 +2484,7 @@ GtkScrolledWindowPrivate
 <FILE>gtksearchbar</FILE>
 <TITLE>GtkSearchBar</TITLE>
 GtkSearchBar
+GtkSearchBarClass
 gtk_search_bar_new
 gtk_search_bar_connect_entry
 gtk_search_bar_get_search_mode
@@ -2406,6 +2539,23 @@ gtk_separator_get_type
 GtkSeparatorPrivate
 </SECTION>
 
+<SECTION>
+<FILE>gtkseparatormenuitem</FILE>
+<TITLE>GtkSeparatorMenuItem</TITLE>
+GtkSeparatorMenuItem
+GtkSeparatorMenuItemClass
+gtk_separator_menu_item_new
+<SUBSECTION Standard>
+GTK_SEPARATOR_MENU_ITEM
+GTK_SEPARATOR_MENU_ITEM_CLASS
+GTK_SEPARATOR_MENU_ITEM_GET_CLASS
+GTK_IS_SEPARATOR_MENU_ITEM
+GTK_IS_SEPARATOR_MENU_ITEM_CLASS
+GTK_TYPE_SEPARATOR_MENU_ITEM
+<SUBSECTION Private>
+gtk_separator_menu_item_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtksettings</FILE>
 <TITLE>GtkSettings</TITLE>
@@ -2413,6 +2563,11 @@ GtkSettings
 GtkSettingsValue
 gtk_settings_get_default
 gtk_settings_get_for_display
+gtk_rc_property_parse_color
+gtk_rc_property_parse_enum
+gtk_rc_property_parse_flags
+gtk_rc_property_parse_requisition
+gtk_rc_property_parse_border
 gtk_settings_reset_property
 <SUBSECTION Standard>
 GtkSettingsClass
@@ -2683,18 +2838,6 @@ gtk_text_buffer_begin_user_action
 gtk_text_buffer_end_user_action
 gtk_text_buffer_add_selection_clipboard
 gtk_text_buffer_remove_selection_clipboard
-gtk_text_buffer_get_can_undo
-gtk_text_buffer_get_can_redo
-gtk_text_buffer_get_enable_undo
-gtk_text_buffer_set_enable_undo
-gtk_text_buffer_get_max_undo_levels
-gtk_text_buffer_set_max_undo_levels
-gtk_text_buffer_undo
-gtk_text_buffer_redo
-gtk_text_buffer_begin_irreversible_action
-gtk_text_buffer_end_irreversible_action
-gtk_text_buffer_begin_user_action
-gtk_text_buffer_end_user_action
 
 <SUBSECTION Standard>
 GTK_TEXT_BUFFER
@@ -2900,8 +3043,10 @@ gtk_text_view_get_line_at_y
 gtk_text_view_get_line_yrange
 gtk_text_view_get_iter_at_location
 gtk_text_view_get_iter_at_position
-gtk_text_view_buffer_to_window_coords
+gtk_text_view_buffer_to_surface_coords
 gtk_text_view_window_to_buffer_coords
+gtk_text_view_set_border_window_size
+gtk_text_view_get_border_window_size
 gtk_text_view_forward_display_line
 gtk_text_view_backward_display_line
 gtk_text_view_forward_display_line_end
@@ -2913,10 +3058,8 @@ GtkTextChildAnchor
 gtk_text_child_anchor_new
 gtk_text_child_anchor_get_widgets
 gtk_text_child_anchor_get_deleted
-gtk_text_view_get_gutter
-gtk_text_view_set_gutter
-gtk_text_view_add_overlay
-gtk_text_view_move_overlay
+gtk_text_view_add_child_in_window
+gtk_text_view_move_child
 gtk_text_view_set_wrap_mode
 gtk_text_view_get_wrap_mode
 gtk_text_view_set_editable
@@ -3080,8 +3223,9 @@ gtk_tool_item_get_orientation
 gtk_tool_item_get_toolbar_style
 gtk_tool_item_get_text_alignment
 gtk_tool_item_get_text_orientation
-gtk_tool_item_set_overflow_text
-gtk_tool_item_get_overflow_text
+gtk_tool_item_retrieve_proxy_menu_item
+gtk_tool_item_get_proxy_menu_item
+gtk_tool_item_set_proxy_menu_item
 gtk_tool_item_rebuild_menu
 gtk_tool_item_toolbar_reconfigured
 gtk_tool_item_get_text_size_group
@@ -3103,6 +3247,7 @@ GtkToolItemPrivate
 <FILE>gtkseparatortoolitem</FILE>
 <TITLE>GtkSeparatorToolItem</TITLE>
 GtkSeparatorToolItem
+GtkSeparatorToolItemClass
 gtk_separator_tool_item_new
 gtk_separator_tool_item_set_draw
 gtk_separator_tool_item_get_draw
@@ -3154,9 +3299,10 @@ GtkToolButtonPrivate
 <FILE>gtkmenutoolbutton</FILE>
 <TITLE>GtkMenuToolButton</TITLE>
 GtkMenuToolButton
+GtkMenuToolButtonClass
 gtk_menu_tool_button_new
-gtk_menu_tool_button_set_popover
-gtk_menu_tool_button_get_popover
+gtk_menu_tool_button_set_menu
+gtk_menu_tool_button_get_menu
 gtk_menu_tool_button_set_arrow_tooltip_text
 gtk_menu_tool_button_set_arrow_tooltip_markup
 
@@ -3235,29 +3381,6 @@ GTK_TOOLTIP
 gtk_tooltip_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtktreelistrow</FILE>
-<TITLE>GtkTreeListRow</TITLE>
-gtk_tree_list_row_get_item
-gtk_tree_list_row_set_expanded
-gtk_tree_list_row_get_expanded
-gtk_tree_list_row_is_expandable
-gtk_tree_list_row_get_position
-gtk_tree_list_row_get_depth
-gtk_tree_list_row_get_children
-gtk_tree_list_row_get_parent
-gtk_tree_list_row_get_child_row
-<SUBSECTION Standard>
-GTK_TREE_LIST_ROW
-GTK_IS_TREE_LIST_ROW
-GTK_TYPE_TREE_LIST_ROW
-GTK_TREE_LIST_ROW_CLASS
-GTK_IS_TREE_LIST_ROW_CLASS
-GTK_TREE_LIST_ROW_GET_CLASS
-<SUBSECTION Private>
-gtk_tree_list_row_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtktreelistmodel</FILE>
 <TITLE>GtkTreeListModel</TITLE>
@@ -3271,6 +3394,18 @@ gtk_tree_list_model_set_autoexpand
 gtk_tree_list_model_get_autoexpand
 gtk_tree_list_model_get_child_row
 gtk_tree_list_model_get_row
+
+<SUBSECTION>
+gtk_tree_list_row_get_item
+gtk_tree_list_row_set_expanded
+gtk_tree_list_row_get_expanded
+gtk_tree_list_row_is_expandable
+gtk_tree_list_row_get_position
+gtk_tree_list_row_get_depth
+gtk_tree_list_row_get_children
+gtk_tree_list_row_get_parent
+gtk_tree_list_row_get_child_row
+
 <SUBSECTION Standard>
 GTK_TREE_LIST_MODEL
 GTK_IS_TREE_LIST_MODEL
@@ -3278,7 +3413,14 @@ GTK_TYPE_TREE_LIST_MODEL
 GTK_TREE_LIST_MODEL_CLASS
 GTK_IS_TREE_LIST_MODEL_CLASS
 GTK_TREE_LIST_MODEL_GET_CLASS
+GTK_TREE_LIST_ROW
+GTK_IS_TREE_LIST_ROW
+GTK_TYPE_TREE_LIST_ROW
+GTK_TREE_LIST_ROW_CLASS
+GTK_IS_TREE_LIST_ROW_CLASS
+GTK_TREE_LIST_ROW_GET_CLASS
 <SUBSECTION Private>
+gtk_tree_list_model_get_type
 gtk_tree_list_row_get_type
 </SECTION>
 
@@ -3424,6 +3566,7 @@ gtk_tree_model_filter_get_type
 <FILE>gtktreeselection</FILE>
 <TITLE>GtkTreeSelection</TITLE>
 GtkTreeSelection
+GtkTreeSelectionClass
 GtkTreeSelectionFunc
 GtkTreeSelectionForeachFunc
 gtk_tree_selection_set_mode
@@ -3625,6 +3768,7 @@ gtk_tree_view_column_get_type
 <TITLE>GtkTreeView</TITLE>
 GtkTreeView
 GtkTreeViewDropPosition
+GtkTreeViewPrivate
 GtkTreeViewColumnDropFunc
 GtkTreeViewMappingFunc
 GtkTreeViewSearchEqualFunc
@@ -3699,6 +3843,9 @@ gtk_tree_view_get_search_equal_func
 gtk_tree_view_set_search_equal_func
 gtk_tree_view_get_search_entry
 gtk_tree_view_set_search_entry
+GtkTreeViewSearchPositionFunc
+gtk_tree_view_get_search_position_func
+gtk_tree_view_set_search_position_func
 gtk_tree_view_get_fixed_height_mode
 gtk_tree_view_set_fixed_height_mode
 gtk_tree_view_get_hover_selection
@@ -3737,6 +3884,7 @@ gtk_tree_view_get_type
 <FILE>gtkcellview</FILE>
 <TITLE>GtkCellView</TITLE>
 GtkCellView
+GtkCellViewClass
 gtk_cell_view_new
 gtk_cell_view_new_with_context
 gtk_cell_view_new_with_text
@@ -3884,6 +4032,7 @@ GtkCellAreaContextPrivate
 <FILE>gtkcellareabox</FILE>
 <TITLE>GtkCellAreaBox</TITLE>
 GtkCellAreaBox
+GtkCellAreaBoxClass
 gtk_cell_area_box_new
 gtk_cell_area_box_pack_start
 gtk_cell_area_box_pack_end
@@ -4163,6 +4312,7 @@ gtk_list_store_get_type
 <FILE>gtkviewport</FILE>
 <TITLE>GtkViewport</TITLE>
 GtkViewport
+GtkViewportClass
 gtk_viewport_new
 gtk_viewport_set_shadow_type
 gtk_viewport_get_shadow_type
@@ -4468,7 +4618,7 @@ gtk_widget_class_bind_template_child_internal_private
 gtk_widget_class_bind_template_child_full
 gtk_widget_class_bind_template_callback
 gtk_widget_class_bind_template_callback_full
-gtk_widget_class_set_template_scope
+gtk_widget_class_set_connect_func
 
 <SUBSECTION>
 gtk_widget_observe_children
@@ -4536,8 +4686,8 @@ gtk_window_set_default_widget
 gtk_window_present
 gtk_window_present_with_time
 gtk_window_close
-gtk_window_minimize
-gtk_window_unminimize
+gtk_window_iconify
+gtk_window_deiconify
 gtk_window_stick
 gtk_window_unstick
 gtk_window_maximize
@@ -5048,16 +5198,15 @@ gtk_drag_source_add_uri_targets
 <FILE>gtkbindings</FILE>
 <TITLE>Bindings</TITLE>
 GtkBindingSet
+GtkBindingEntry
+GtkBindingSignal
+GtkBindingArg
 gtk_binding_set_new
 gtk_binding_set_by_class
 gtk_binding_set_find
 gtk_bindings_activate
 gtk_bindings_activate_event
 gtk_binding_set_activate
-gtk_binding_entry_add_action
-gtk_binding_entry_add_action_variant
-GtkBindingCallback
-gtk_binding_entry_add_callback
 gtk_binding_entry_add_signal
 gtk_binding_entry_add_signal_from_string
 gtk_binding_entry_skip
@@ -5092,6 +5241,7 @@ GtkIconSize
 <TITLE>GtkIconTheme</TITLE>
 GtkIconInfo
 GtkIconTheme
+GtkIconThemeClass
 GtkIconLookupFlags
 GTK_ICON_THEME_ERROR
 GtkIconThemeError
@@ -5114,13 +5264,17 @@ gtk_icon_theme_lookup_by_gicon
 gtk_icon_theme_lookup_by_gicon_for_scale
 gtk_icon_theme_load_icon
 gtk_icon_theme_load_icon_for_scale
+gtk_icon_theme_list_contexts
 gtk_icon_theme_list_icons
 gtk_icon_theme_get_icon_sizes
+gtk_icon_theme_get_example_icon_name
 gtk_icon_theme_rescan_if_needed
+gtk_icon_info_new_for_pixbuf
 gtk_icon_info_get_base_size
 gtk_icon_info_get_base_scale
 gtk_icon_info_get_filename
 gtk_icon_info_load_icon
+gtk_icon_info_load_texture
 gtk_icon_info_load_icon_async
 gtk_icon_info_load_icon_finish
 gtk_icon_info_load_symbolic
@@ -5624,6 +5778,7 @@ gtk_print_job_get_type
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
+GtkPageSetupUnixDialogClass
 gtk_page_setup_unix_dialog_new
 gtk_page_setup_unix_dialog_set_page_setup
 gtk_page_setup_unix_dialog_get_page_setup
@@ -5834,6 +5989,7 @@ gtk_grid_get_type
 <SECTION>
 <FILE>gtkswitch</FILE>
 GtkSwitch
+GtkSwitchClass
 gtk_switch_new
 gtk_switch_set_active
 gtk_switch_get_active
@@ -5883,6 +6039,7 @@ GTK_IS_APP_CHOOSER_ONLINE_PK_CLASS
 <FILE>gtkappchooserbutton</FILE>
 <TITLE>GtkAppChooserButton</TITLE>
 GtkAppChooserButton
+GtkAppChooserButtonClass
 gtk_app_chooser_button_new
 gtk_app_chooser_button_append_custom_item
 gtk_app_chooser_button_append_separator
@@ -5911,6 +6068,7 @@ gtk_app_chooser_button_get_type
 <FILE>gtkappchooserdialog</FILE>
 <TITLE>GtkAppChooserDialog</TITLE>
 GtkAppChooserDialog
+GtkAppChooserDialogClass
 gtk_app_chooser_dialog_new
 gtk_app_chooser_dialog_new_for_content_type
 gtk_app_chooser_dialog_get_widget
@@ -5934,6 +6092,7 @@ gtk_app_chooser_dialog_get_type
 <FILE>gtkappchooserwidget</FILE>
 <TITLE>GtkAppChooserWidget</TITLE>
 GtkAppChooserWidget
+GtkAppChooserWidgetClass
 gtk_app_chooser_widget_new
 gtk_app_chooser_widget_set_show_default
 gtk_app_chooser_widget_get_show_default
@@ -5965,6 +6124,7 @@ gtk_app_chooser_widget_get_type
 <FILE>gtklockbutton</FILE>
 <TITLE>GtkLockButton</TITLE>
 GtkLockButton
+GtkLockButtonClass
 
 gtk_lock_button_new
 gtk_lock_button_get_permission
@@ -5986,6 +6146,7 @@ GtkLockButtonPrivate
 <FILE>gtkoverlay</FILE>
 <TITLE>GtkOverlay</TITLE>
 GtkOverlay
+GtkOverlayClass
 
 gtk_overlay_new
 gtk_overlay_add_overlay
@@ -6035,6 +6196,7 @@ gtk_color_chooser_get_type
 <FILE>gtkcolorchooserwidget</FILE>
 <TITLE>GtkColorChooserWidget</TITLE>
 GtkColorChooserWidget
+GtkColorChooserWidgetClass
 gtk_color_chooser_widget_new
 
 <SUBSECTION Standard>
@@ -6194,6 +6356,7 @@ gtk_stack_switcher_get_type
 <FILE>gtkrevealer</FILE>
 <TITLE>GtkRevealer</TITLE>
 GtkRevealer
+GtkRevealerClass
 gtk_revealer_new
 gtk_revealer_get_reveal_child
 gtk_revealer_set_reveal_child
@@ -6300,11 +6463,15 @@ gtk_popover_set_pointing_to
 gtk_popover_get_pointing_to
 gtk_popover_set_position
 gtk_popover_get_position
+GtkPopoverConstraint
+gtk_popover_set_constrain_to
+gtk_popover_get_constrain_to
 gtk_popover_set_autohide
 gtk_popover_get_autohide
 gtk_popover_set_has_arrow
 gtk_popover_get_has_arrow
 gtk_popover_set_default_widget
+gtk_popover_get_default_widget
 <SUBSECTION Standard>
 GTK_TYPE_POPOVER
 GTK_IS_POPOVER
@@ -6324,14 +6491,18 @@ gtk_popover_get_type
 <FILE>gtkpopovermenu</FILE>
 <TITLE>GtkPopoverMenu</TITLE>
 GtkPopoverMenu
+gtk_popover_menu_new
 gtk_popover_menu_new_from_model
-gtk_popover_menu_set_menu_model
-gtk_popover_menu_get_menu_model
+gtk_popover_menu_add_submenu
+gtk_popover_menu_open_submenu
 
 <SUBSECTION Standard>
 GTK_TYPE_POPOVER_MENU
 GTK_IS_POPOVER_MENU
+GTK_IS_POPOVER_MENU_CLASS
 GTK_POPOVER_MENU
+GTK_POPOVER_MENU_CLASS
+GTK_POPOVER_MENU_GET_CLASS
 
 <SUBSECTION Private>
 gtk_popover_menu_get_type
@@ -6354,6 +6525,20 @@ GTK_POPOVER_MENU_BAR
 gtk_popover_menu_bar_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkmodelbutton</FILE>
+<TITLE>GtkModelButton</TITLE>
+GtkModelButton
+GtkButtonRole
+gtk_model_button_new
+<SUBSECTION Standard>
+GTK_TYPE_MODEL_BUTTON
+GTK_MODEL_BUTTON
+GTK_IS_MODEL_BUTTON
+<SUBSECTION Private>
+gtk_model_button_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkeventcontroller</FILE>
 <TITLE>GtkEventController</TITLE>
@@ -6491,8 +6676,6 @@ GtkEventControllerMotion
 gtk_event_controller_motion_new
 gtk_event_controller_motion_get_pointer_origin
 gtk_event_controller_motion_get_pointer_target
-gtk_event_controller_motion_contains_pointer
-gtk_event_controller_motion_is_pointer
 
 <SUBSECTION Standard>
 GTK_TYPE_EVENT_CONTROLLER_MOTION
@@ -6517,8 +6700,6 @@ gtk_event_controller_key_forward
 gtk_event_controller_key_get_group
 gtk_event_controller_key_get_focus_origin
 gtk_event_controller_key_get_focus_target
-gtk_event_controller_key_contains_focus
-gtk_event_controller_key_is_focus
 
 <SUBSECTION Standard>
 GTK_TYPE_EVENT_CONTROLLER_KEY
@@ -7061,8 +7242,8 @@ gtk_fixed_layout_new
 <SUBSECTION>
 GtkFixedLayoutChild
 
-gtk_fixed_layout_child_set_transform
-gtk_fixed_layout_child_get_transform
+gtk_fixed_layout_child_set_position
+gtk_fixed_layout_child_get_position
 
 <SUBSECTION Standard>
 GTK_TYPE_FIXED_LAYOUT

docs/reference/gtk/gtk4.types.in

@@ -22,9 +22,7 @@ gtk_bin_get_type
 gtk_bin_layout_get_type
 gtk_box_get_type
 gtk_box_layout_get_type
-gtk_builder_cscope_get_type
 gtk_builder_get_type
-gtk_builder_scope_get_type
 gtk_buildable_get_type
 gtk_button_get_type
 gtk_calendar_get_type
@@ -44,6 +42,7 @@ gtk_cell_renderer_text_get_type
 gtk_cell_renderer_toggle_get_type
 gtk_cell_view_get_type
 gtk_check_button_get_type
+gtk_check_menu_item_get_type
 gtk_color_button_get_type
 gtk_color_chooser_get_type
 gtk_color_chooser_dialog_get_type
@@ -73,10 +72,8 @@ gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
-gtk_filter_list_model_get_type
 gtk_fixed_get_type
 gtk_fixed_layout_get_type
-gtk_flatten_list_model_get_type
 gtk_flow_box_get_type
 gtk_flow_box_child_get_type
 gtk_font_button_get_type
@@ -114,16 +111,18 @@ gtk_list_store_get_type
 gtk_list_box_get_type
 gtk_list_box_row_get_type
 gtk_lock_button_get_type
-gtk_map_list_model_get_type
 gtk_media_controls_get_type
 gtk_media_file_get_type
 gtk_media_stream_get_type
+gtk_menu_bar_get_type
 gtk_menu_button_get_type
+gtk_menu_get_type
+gtk_menu_item_get_type
+gtk_menu_shell_get_type
 gtk_menu_tool_button_get_type
 gtk_message_dialog_get_type
+gtk_model_button_get_type
 gtk_mount_operation_get_type
-gtk_native_get_type
-gtk_no_selection_get_type
 gtk_notebook_get_type
 gtk_notebook_page_get_type
 gtk_orientable_get_type
@@ -147,6 +146,7 @@ gtk_print_settings_get_type
 @DISABLE_ON_W32@gtk_print_unix_dialog_get_type
 gtk_progress_bar_get_type
 gtk_radio_button_get_type
+gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
 gtk_recent_manager_get_type
@@ -161,6 +161,7 @@ gtk_search_bar_get_type
 gtk_search_entry_get_type
 gtk_selection_model_get_type
 gtk_separator_get_type
+gtk_separator_menu_item_get_type
 gtk_separator_tool_item_get_type
 gtk_settings_get_type
 gtk_shortcut_label_get_type
@@ -170,9 +171,7 @@ gtk_shortcuts_group_get_type
 gtk_shortcuts_shortcut_get_type
 gtk_single_selection_get_type
 gtk_size_group_get_type
-gtk_slice_list_model_get_type
 gtk_snapshot_get_type
-gtk_sort_list_model_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
@@ -199,8 +198,6 @@ gtk_tool_button_get_type
 gtk_tool_item_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
-gtk_tree_list_model_get_type
-gtk_tree_list_row_get_type
 gtk_tree_model_filter_get_type
 gtk_tree_model_get_type
 gtk_tree_model_sort_get_type

docs/reference/gtk/meson.build

@@ -1,6 +1,4 @@
 private_headers = [
-  'imm-extra.h',
-  'gtkbitmaskprivateimpl.h',
   'gdkpixbufutilsprivate.h',
   'gtkaccelgroupprivate.h',
   'gtkaccelmapprivate.h',
@@ -17,6 +15,7 @@ private_headers = [
   'gtkbuttonprivate.h',
   'gtkcellareaboxcontextprivate.h',
   'gtkcheckbuttonprivate.h',
+  'gtkcheckmenuitemprivate.h',
   'gtkcolorchooserprivate.h',
   'gtkcoloreditorprivate.h',
   'gtkcolorplaneprivate.h',
@@ -36,7 +35,6 @@ private_headers = [
   'gtkcssarrayvalueprivate.h',
   'gtkcssbgsizevalueprivate.h',
   'gtkcssbordervalueprivate.h',
-  'gtkcssboxesprivate.h',
   'gtkcsscalcvalueprivate.h',
   'gtkcsscolorvalueprivate.h',
   'gtkcsscornervalueprivate.h',
@@ -137,6 +135,9 @@ private_headers = [
   'gtkmagnifierprivate.h',
   'gtkmediafileprivate.h',
   'gtkmenubuttonprivate.h',
+  'gtkmenuitemprivate.h',
+  'gtkmenuprivate.h',
+  'gtkmenushellprivate.h',
   'gtkmodulesprivate.h',
   'gtkmountoperationprivate.h',
   'gtknativedialogprivate.h',
@@ -177,10 +178,8 @@ private_headers = [
   'gtktextchildprivate.h',
   'gtktextdisplayprivate.h',
   'gtktexthandleprivate.h',
-  'gtktexthistoryprivate.h',
   'gtktextiterprivate.h',
   'gtktextlayoutprivate.h',
-  'gtktextlinedisplaycacheprivate.h',
   'gtktextmarkprivate.h',
   'gtktexttagprivate.h',
   'gtktextviewprivate.h',
@@ -343,8 +342,8 @@ images = [
 content_files = [
   'actions.xml',
   'broadway.xml',
-  'building.xml',
-  'compiling.xml',
+  'building.sgml',
+  'compiling.sgml',
   'css-overview.xml',
   'css-properties.xml',
   'drawing-model.xml',
@@ -362,31 +361,31 @@ content_files = [
   'input-handling.xml',
   'migrating-2to4.xml',
   'migrating-3to4.xml',
-  'osx.xml',
-  'other_software.xml',
+  'osx.sgml',
+  'other_software.sgml',
   'overview.xml',
-  'question_index.xml',
-  'resources.xml',
-  'running.xml',
-  'text_widget.xml',
-  'tree_widget.xml',
+  'question_index.sgml',
+  'resources.sgml',
+  'running.sgml',
+  'text_widget.sgml',
+  'tree_widget.sgml',
   'visual_index.xml',
   'wayland.xml',
-  'windows.xml',
-  'x11.xml',
+  'windows.sgml',
+  'x11.sgml',
 ]
 
 expand_content_files = [
   'actions.xml',
-  'compiling.xml',
+  'compiling.sgml',
   'drawing-model.xml',
   'glossary.xml',
   'input-handling.xml',
   'migrating-2to4.xml',
   'migrating-3to4.xml',
-  'question_index.xml',
-  'text_widget.xml',
-  'tree_widget.xml',
+  'question_index.sgml',
+  'text_widget.sgml',
+  'tree_widget.sgml',
 ]
 
 types_conf = configuration_data()

docs/reference/gtk/migrating-3to4.xml

@@ -305,18 +305,6 @@
       </para>
     </section>
 
-    <section>
-      <title>Stop using grabs</title>
-      <para>
-        GTK 4 no longer provides the gdk_device_grab() or gdk_seat_grab() apis.
-      </para>
-      <para>
-        If you need to dismiss a popup when the user clicks outside (a common
-        use for grabs), you can use the GdkSurface #GdkSurface:autohide property instead.
-        GtkPopover also has a #GtkPopover:autohide property.
-      </para>
-    </section>
-
     <section>
       <title>Adapt to coordinate API changes</title>
       <para>
@@ -685,7 +673,7 @@
     <section>
       <title>Adapt to changes in the API of GtkEntry, GtkSearchEntry and GtkSpinButton</title>
       <para>
-        The GtkEditable interface has been made more useful, and the core functionality of
+        The GtkEditable has been made more useful, and the core functionality of
         GtkEntry has been broken out as a GtkText widget. GtkEntry, GtkSearchEntry,
         GtkSpinButton and the new GtkPasswordEntry now use a GtkText widget internally
         and implement GtkEditable. In particular, this means that it is no longer
@@ -825,84 +813,6 @@
       </para>
     </section>
 
-    <section>
-      <title>GtkEntryBuffer ::deleted-text has changed</title>
-      <para>
-        To allow signal handlers to access the deleted text before it
-        has been deleted #GtkEntryBuffer::deleted-text has changed from
-        %G_SIGNAL_RUN_FIRST to %G_SIGNAL_RUN_LAST. The default handler
-        removes the text from the #GtkEntryBuffer.
-      </para>
-      <para>
-        To adapt existing code, use g_signal_connect_after() or
-        %G_CONNECT_AFTER when using g_signal_connect_data() or
-        g_signal_connect_object().
-      </para>
-    </section>
-
-    <section>
-      <title>The "iconified" window state has been renamed to "minimized"</title>
-      <para>
-        The <literal>GDK_SURFACE_STATE_ICONIFIED</literal> value of the
-        #GdkSurfaceState enumeration is now %GDK_SURFACE_STATE_MINIMIZED.
-      </para>
-      <para>
-        The #GdkSurface functions <function>gdk_surface_iconify()</function>
-        and <function>gdk_surface_deiconify()</function> have been renamed to
-        gdk_surface_minimize() and gdk_surface_unminimize(), respectively.
-      </para>
-      <para>
-        The corresponding #GtkWindow functions <function>gtk_window_iconify()</function>
-        and <function>gtk_window_deiconify()</function> have been renamed
-        to gtk_window_minimize() and gtk_window_unminimize(), respectively.
-      </para>
-      <para>
-        The behavior of the minimization and unminimization operations have
-        not been changed, and they still require support from the underlying
-        windowing system.
-      </para>
-    </section>
-
-    <section>
-      <title>GtkMenu, GtkMenuBar and GtkMenuItem are gone</title>
-      <para>
-        These widgets were heavily relying on X11-centric concepts such as
-        override-redirect windows and grabs, and were hard to adjust to other
-        windowing systems.
-      </para>
-      <para>
-        Menus can already be replaced using GtkPopoverMenu in GTK 3. Additionally,
-        GTK 4 introduces GtkPopoverMenuBar to replace menubars. These new widgets
-        can only be constructed from menu models, so the porting effort involves
-        switching to menu models and actions.
-      </para>
-      <para>
-        Since menus are gone, GtkMenuButton and GtkMenuToolButton also lost their
-        ability to show menus, and need to be used with popovers in GTK 4.
-      </para>
-    </section>
-
-    <section>
-      <title>GtkToolbar overflow handling has changed</title>
-      <para>
-        The handling of overflow in toolbars has been simplified.
-        Instead of creating a proxy menuitem and setting it with
-        gtk_tool_item_set_proxy_menu_item(), you simply provide
-        a label for the overflow menu with gtk_tool_item_set_overflow_text().
-        GTK will figure out itself whether to create a check- or
-        radioitem as proxy.
-      </para>
-    </section>
-
-    <section>
-      <title>Stop using custom tooltip windows</title>
-      <para>
-        Tooltips no longer use GtkWindows in GTK 4, and it is no longer
-        possible to provide a custom window for tooltips. Replacing the content
-        of the tooltip with a custom widget is still possible, with
-        gtk_tooltip_set_custom().
-      </para>
-    </section>
   </section>
 
 </chapter>

docs/reference/gtk/text_widget.sgml

@@ -112,16 +112,6 @@ multiple bytes in UTF-8, and the two-character sequence "\r\n" is also
 considered a line separator.
 </para>
 
-<para>
-Text buffers support undo and redo if gtk_text_buffer_set_undo_enabled()
-has been set to %TRUE. Use gtk_text_buffer_undo() or gtk_text_buffer_redo()
-to perform the necessary action. Note that these operations are ignored if
-the buffer is not editable. Developers may want some operations to not be
-undoable. To do this, wrap your changes in
-gtk_text_buffer_begin_irreversible_action() and
-gtk_text_buffer_end_irreversible_action().
-</para>
-
 </refsect1>
 
 

docs/reference/gtk/visual_index.xml

@@ -162,6 +162,9 @@
     <link linkend="GtkPaned">
       <inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic>
     </link>
+    <link linkend="GtkMenuBar">
+      <inlinegraphic fileref="menubar.png" format="PNG"></inlinegraphic>
+    </link>
     <link linkend="GtkToolbar">
       <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
     </link>

docs/reference/gtk/x11.sgml

@@ -138,7 +138,7 @@ url="http://www.freedesktop.org/standards/">convention</ulink>.
 <para>
 GTK has functions for asking the window manager to do various things;
 see for example <link
-linkend="gtk-window-minimize">gtk_window_minimize()</link> or <link
+linkend="gtk-window-iconify">gtk_window_iconify()</link> or <link
 linkend="gtk-window-maximize">gtk_window_maximize()</link> or <link
 linkend="gtk-window-set-decorated">gtk_window_set_decorated()</link>.
 Keep in mind that most window managers <emphasis>will</emphasis> ignore

docs/styles.txt

@@ -0,0 +1,97 @@
+HANDLING WIDGET STYLES
+======================
+
+
+A widget gets created with a default style.
+The global default style can be affected by gtk_widget_set_default_style()
+and can be queried by gtk_widget_get_default_style().
+The initial style that is assigned to a widget as default style upon
+creation can be affected by wrapping the widget's creation as follows:
+gtk_widget_push_style (my_style);
+widget = gtk_type_new (gtk_button_get_type ());
+gtk_widget_pop_style ();
+
+There are certain functions to affect widget styles after a widget's
+creation:
+
+gtk_widget_set_style ()
+  Save the default style and set a user style.
+  This will override a previously set user style or
+  previously set rc styles.
+
+gtk_widget_reset_rc_styles ()
+  Descends through a widget hierarchy and sets the rc style
+  on all widgets that don't have a user style set.
+
+gtk_widget_ensure_style ()
+  Ensure that the widget either has a user style set, or an rc lookup
+  has been performed.
+
+gtk_rc_get_style ()
+  Return an rc style for a widget if there is one.
+
+gtk_widget_set_name ()
+  Change widget name, and perform a new rc lookup if no user style
+  is set.
+
+gtk_widget_realize ()
+  Besides realizing the widget this function will:
+  - perform an rc lookup if necessary,
+  - attach a widget's style.
+
+gtk_widget_get_style ()
+  Return a widgets style, this function will perform an rc lookup
+  if necessary.
+
+gtk_widget_set_parent ()
+  This function will perform rc lookups recursively for all widgets
+  that do not have a user style set.
+
+gtk_style_copy ()
+  This function can be used to copy a widget's style.
+  The style can subsequently be changed (e.g., by modifications to the
+  red/green/blue values of a certain color) and then be applied to the
+  widget via gtk_widget_set_style().
+
+
+GtkWidget::style_set
+  This signal will be emitted for a widget once its style changes with
+  an additional argument previous_style which will hold the widget->style
+  value from a previous emission.
+  The initial emission of this signal is guaranteed to happen prior
+  to any GtkWidget::size_request emission, and will have the previous_style
+  argument set to NULL.
+  The GtkWidgetClass implements a default handler for this signal that
+  will set the widget's window's background of widgets that provide their
+  own windows according to the new style.
+  Derived widgets need to override this default handler, if:
+  - their size requisition depends on the current style.
+    (e.g., on the style's fonts)
+  - they set the background of widget->window to something other than.
+    style->bg. (e.g., GtkListItem)
+  - the widget provides windows other than widget->window.
+  - the widget has any other stored dependencies on the style.
+                   
+
+
+Flag indications:
+
+!GTK_RC_STYLE && !GTK_USER_STYLE:
+  The widget has its default style set, no rc lookup has been
+  performed, the widget has not been size requested yet and is
+  therefore not yet realized.
+
+GTK_USER_STYLE:
+  GTK_RC_STYLE is not set.
+  The widget has a user style assigned, and its default style has been
+  saved.
+
+GTK_RC_STYLE:
+  GTK_USER_STYLE is not set.
+  If the widget has a saved default style, it has been assigned an
+  rc style. If the widget does not have a saved default style, it still
+  has its default style but an rc lookup has already been performed.
+
+
+	- Tim Janik <timj@gimp.org>
+	  1998/02/27

docs/tools/widgets.c

@@ -152,8 +152,8 @@ create_menu_button (void)
   image = gtk_image_new ();
   gtk_image_set_from_icon_name (GTK_IMAGE (image), "emblem-system-symbolic");
   gtk_container_add (GTK_CONTAINER (widget), image);
-  menu = gtk_popover_new (NULL);
-  gtk_menu_button_set_popover (GTK_MENU_BUTTON (widget), menu);
+  menu = gtk_menu_new ();
+  gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_container_add (GTK_CONTAINER (vbox), widget);
@@ -800,6 +800,32 @@ create_toolbar (void)
   return new_widget_info ("toolbar", widget, SMALL);
 }
 
+static WidgetInfo *
+create_menubar (void)
+{
+  GtkWidget *widget, *vbox, *item;
+
+  widget = gtk_menu_bar_new ();
+
+  item = gtk_menu_item_new_with_mnemonic ("_File");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("_Edit");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("_Help");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
+  gtk_container_add (GTK_CONTAINER (vbox),
+		      gtk_label_new ("Menu Bar"));
+
+  return new_widget_info ("menubar", vbox, SMALL);
+}
+
 static WidgetInfo *
 create_message_dialog (void)
 {
@@ -1412,6 +1438,7 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_image ());
   retval = g_list_prepend (retval, create_label ());
   retval = g_list_prepend (retval, create_link_button ());
+  retval = g_list_prepend (retval, create_menubar ());
   retval = g_list_prepend (retval, create_message_dialog ());
   retval = g_list_prepend (retval, create_notebook ());
   retval = g_list_prepend (retval, create_panes ());

docs/widget_geometry.txt

@@ -0,0 +1,836 @@
+This file is some notes about how different widgets are drawn.
+
+=============
+
+GtkMenu
+
+=============
++----------------------------------------------------------------------------+
+|                                A                                           |
+| +------------------------------------------------------------------------+ |
+| |############################# C ########################################| |
+| |#                             D                                        #| |
+| |# +-------------------------------------------------------------------+#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                      Item 1                                       |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# +-------------------------------------------------------------------+#| |
+| |# +-------------------------------------------------------------------+#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+|A|B |                                                                   |B|A|
+| |# |                      Item 2                                       |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# +-------------------------------------------------------------------+#| |
+| |#                        [...]                                         #| |
+| |# +-------------------------------------------------------------------+#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                      Item n                                       |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# |                                                                   |#| |
+| |# +-------------------------------------------------------------------+#| |
+| |#                             D                                        #| |
+| |############################# C ########################################| |
+| +------------------------------------------------------------------------| |
+|                                A                                           |
++----------------------------------------------------------------------------+
+
+A: GtkContainer::border_width
+B: xthickness
+C: ythickness
+D: vertical_padding
+
+=============
+
+GtkMenuItem
+
+=============
+
++----------------------------------------------------------------------------+
+|                                A                                           |
+| +------------------------------------------------------------------------+ |
+| |############################# C ########################################| |
+| |#+-+------------+--+-------------------------------+--+-------------+-+#| |
+| |#| |\\\\\\\\\\\\|  |                  /|\          |**|             | |#| |
+| |#| |<------E------>|                   |           |**|      G      | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|             | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>        | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>>>      | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>>>>>    | |#| |
+|A|B|D|\\\\\\\\\\\\| F|      Child        G           |*H|   >>>>>>>>  |D|B|A|
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>>>>>    | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>>>      | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|   >>        | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|             | |#| |
+| |#| |\\\\\\\\\\\\|  |                   |           |**|             | |#| |
+| |#| |\\\\\\\\\\\\|  |                  \|/          |**|             | |#| |
+| |#+-+------------+--+-------------------------------+--+-------------+-+#| |
+| |############################# C ########################################| |
+| +------------------------------------------------------------------------+ |
+|                                A                                           |
++----------------------------------------------------------------------------+
+
+A: GtkContainer:border_width
+B: xthickness
+C: ythickness
+D: horizontal_padding
+E: toggle_size
+F: toggle_spacing
+G: Requested height of child (also used for width of arrow
+H: arrow_spacing spacing (when the item has a non-vertical submenu)
+
+
+=============
+
+GtkOptionMenu:
+
+=============
+
+Geometry parameters
+
+ Style properties
+
+   GtkWidget::interior_focus = TRUE
+   GtkWidget::focus_width = 1
+   GtkWidget::focus_padding = 0
+   GtkOptionMenu::indicator_size = { 7, 13 }
+   GtkOptionMenu::indicator_spacing = { 7, 5, 2, 2 }
+
+ Properties
+
+   GtkContainer::border_width = 0
+
+ #defines
+
+   CHILD_LEFT_SPACING = 5
+   CHILD_RIGHT_SPACING = 1
+   CHILD_TOP_SPACING = 1
+   CHILD_BOTTOM_SPACING = 1
+
+
+I) interior_focus = TRUE
+
++--------------------------------------------------+
++                       A                          |
+| +----------------------------------------------+ |
+| |\\\\\\\\\\\\\\\\\\\\ H ///////////////////////| |
+| |\+------------------------------------------+/| |
+| |\|                   C                      |/| |
+| |\| +------------------------------+         |/| |
+| |\| |################ D ###########|    L    |/| |
+| |\| |#+--------------------------+#|         |/| |
+| |\| |#|         K                |#|         |/| |
+| |\| |#| +----------------------+ |#| +-----+ |/| |
+| |\| |#| |                      | |#| | /#\ | |/| |
+| |\| |#| |                      | |#| | === | |/| |
+|A|B|C|D|E|    	 Child        	 |F|D|G| IxJ |O|B|A|
+| |/| |#| |                      | |#| | === | |\| |
+| |/| |#| |                      | |#| | \#/ | |\| |
+| |/| |#| +----------------------+ |#| +-----+ |\| |
+| |/| |#|         M                |#|         |\| |
+| |/| |#+---------------------------#|         |\| |
+| |/| |################ D ###########|    N    |\| |
+| |/| +------------------------------+         |\| |
+| |/|                   C                      |\| |
+| |/+------------------------------------------+\| |
+| |////////////////////	H \\\\\\\\\\\\\\\\\\\\\\\| |
+| +----------------------------------------------+ |
+|                      	A 		      	   |
++--------------------------------------------------+
+
+  A: GtkContainer::border_width
+  B: xthickness
+  C: GtkWidget::focus_pad
+  D: GtkWidget::focus_width
+  E: CHILD_LEFT_SPACING
+  F: CHILD_RIGHT_SPACING
+  G: GtkOptionMenu::indicator_spacing::left
+  H: ythickness
+  I: GtkOptionMenu::indicator_size::width
+  J: GtkOptionMenu::indicator_size::height
+  K: CHILD_TOP_SPACING
+  L: GtkOptionMenu::indicator_spacing::top + GtkWidget::focus_width + GtkWidget::focus_pad + CHILD_TOP_SPACING
+  M: CHILD_BOTTOM_SPACING
+  N: GtkOptionMenu::indicator_spacing::bottom + GtkWidget::focus_width + GtkWidget::focus_pad + CHILD_BOTTOM_SPACING
+  O: GtkOptionMenu::indicator_spacing::right
+
+
+II) interior_focus = FALSE
+
++--------------------------------------------------+
++                       A                          |
+| +----------------------------------------------+ |
+| |#################### B #######################| |
+| |#+------------------------------------------+#| |
+| |#|                   C                      |#| |
+| |#| +--------------------------------------+ |#| |
+| |#| |\\\\\\\\\\\\\\\\ H ///////////////////| |#| |
+| |#| |\+----------------------------------+/| |#| |
+| |#| |\|         K                   L    |/| |#| |
+| |#| |\| +----------------------+ +-----+ |/| |#| |
+| |#| |\| |                      | | /#\ | |/| |#| |
+| |#| |\| |                      | | === | |/| |#| |
+|A|B|C|D|E|    	 Child         	 |F| IxJ |G|D|C|B|A|
+| |#| |/| |                      | | === | |\| |#| |
+| |#| |/| |                      | | \#/ | |\| |#| |
+| |#| |/| +----------------------+ +-----+ |\| |#| |
+| |#| |/|         M                   N    |\| |#| |
+| |#| |/+----------------------------------+\| |#| |
+| |#| |////////////////	H \\\\\\\\\\\\\\\\\\\| |#| |
+| |#| +--------------------------------------+ |#| |
+| |#|                   C                      |#| |
+| |#+------------------------------------------+#| |
+| |#################### B #######################| |
+| +----------------------------------------------+ |
+|                      	A 	       	      	   |
++--------------------------------------------------+
+
+
+ A: GtkContainer::border_width
+ B: GtkWidget::focus_width
+ C: GtkWidget::focus_padding
+ D: xthickness
+ E: CHILD_LEFT_SPACING
+ F: CHILD_RIGHT_SPACING + GtkOptionMenu::indicator_spacing::left
+ G: GtkOptionMenu::indicator_spacing::right
+ H: ythickness
+ I: GtkOptionMenu::indicator_size::width
+ J: GtkOptionMenu::indicator_size::height
+ K: CHILD_TOP_SPACING
+ L: CHILD_TOP_SPACING + GtkOptionMenu::indicator_spacing::top
+ M: CHILD_BOTTOM_SPACING
+ N: CHILD_BOTTOM_SPACING + GtkOptionMenu::indicator_spacing::bottom
+
+
+III) interior_focus = FALSE, !HAVE_FOCUS
+
++--------------------------------------------------+
++                       A                          |
+| +----------------------------------------------+ |
+| |\\\\\\\\\\\\\\\\\\\\ H ///////////////////////| |
+| |\+------------------------------------------+/| |
+| |\|                                          |/| |
+| |\|                                          |/| |
+| |\|                                          |/| |
+| |\|                                          |/| |
+| |\|             K                   L        |/| |
+| |\|     +----------------------+ +-----+     |/| |
+| |\|     |                      | | /#\ |     |/| |
+| |\|     |                      | | === |     |/| |
+|A|D|    E|    	 Child         	 |F| IxJ |G    |D|A|
+| |/|     |                      | | === |     |\| |
+| |/|     |                      | | \#/ |     |\| |
+| |/|     +----------------------+ +-----+     |\| |
+| |/|             M                   N        |\| |
+| |/|                                          |\| |
+| |/|                                          |\| |
+| |/|                                          |\| |
+| |/|                                          |\| |
+| |/+------------------------------------------+\| |
+| |//////////////////// H \\\\\\\\\\\\\\\\\\\\\\\| |
+| +----------------------------------------------+ |
+|                      	A 	       	      	   |
++--------------------------------------------------+
+
+
+ A: GtkContainer::border_width
+ B: GtkWidget::focus_width
+ C: GtkWidget::focus_padding
+ D: xthickness
+ E: CHILD_LEFT_SPACING + GtkWidget::focus_width + GtkWidget::focus_padding
+ F: CHILD_RIGHT_SPACING + GtkOptionMenu::in+icator_spacing::left
+ G: GtkOptionMenu::indicator_spacing::right + GtkWidget::focus_width + GtkWidget::focus_padding
+ H: ythickness
+ I: GtkOptionMenu::indicator_size::width
+ J: GtkOptionMenu::indicator_size::height
+ K: CHILD_TOP_SPACING + GtkWidget::focus_width + GtkWidget::focus_padding
+ L: CHILD_TOP_SPACING + GtkOptionMenu::indicator_spacing::top + GtkWidget::focus_width + GtkWidget::focus_padding
+ M: CHILD_BOTTOM_SPACING + GtkWidget::focus_width + GtkWidget::focus_padding
+ N: CHILD_BOTTOM_SPACING + GtkOptionMenu::indicator_spacing::bottom + GtkWidget::focus_width + GtkWidget::focus_padding
+
+
+
+=====================
+
+GtkButton
+
+=====================
+
+NOTE: Due to a bug that is basically unfixable in a sufficiently compatible
+NOTE: way, the button gives the space requested for focus_width and 
+NOTE: focus_padding to the child (in addition to the space requested by
+NOTE: the child), if the button is !CAN_FOCUS.
+
+ Style properties
+
+   GtkWidget::interior_focus = TRUE
+   GtkWidget::focus_width = 1
+   GtkWidget::focus_padding = 0
+   GtkButton::default_border = { 1, 1, 1, 1 };
+   GtkButton::default_outside_border = { 0, 0, 0, 0 };
+   GtkButton::child_displacement_x = 0;
+   GtkButton::child_displacement_y = 0;
+
+ Properties
+
+   GtkContainer::border_width = 0
+
+ #defines
+
+   CHILD_SPACING 1
+
+I) HAS_DEFAULT && (!GtkWidget::interior-focus || !HAVE_FOCUS)
+
++----------------------------------------------+
+|    		       A 		       |
+| +------------------------------------------+ |
+| |@@@@@@@@@@@@@@@@@@@ I @@@@@@@@@@@@@@@@@@@@| |
+| |@+--------------------------------------+@| |
+| |@|\\\\\\\\\\\\\\\\\ J //////////////////|@| |
+| |@|\+----------------------------------+/|@| |
+| |@|\|                E                 |/|@| |
+| |@|\| +------------------------------+ |/|@| |
+| |@|\| |############# F ##############| |/|@| |
+| |@|\| |#+--------------------------+#| |/|@| |
+| |@|\| |#|            L             |#| |/|@| |
+| |@|\| |#| +----------------------+ |#| |/|@| |
+| |@|\| |#| |                      | |#| |/|@| |
+| |@|\| |#| |                      | |#| |/|@| |
+|A|B|D|E|F|G|        Child         |M|F|E|D|C|A|
+| |@|/| |#| |                      | |#| |\|@| |
+| |@|/| |#| |                      | |#| |\|@| |
+| |@|/| |#| +----------------------+ |#| |\|@| |
+| |@|/| |#|            N             |#| |\|@| |
+| |@|/| |#+--------------------------+#| |\|@| |
+| |@|/| |############# F ##############| |\|@| |
+| |@|/| +------------------------------+ |\|@| |
+| |@|/|                E                 |\|@| |
+| |@|/+----------------------------------+\|@| |
+| |@|///////////////// J \\\\\\\\\\\\\\\\\\|@| |
+| |@+--------------------------------------+@| |
+| |@@@@@@@@@@@@@@@@@@@ K @@@@@@@@@@@@@@@@@@@@| |
+| +------------------------------------------+ |
+|                      A                       |
++----------------------------------------------+
+
+A: GtkContainer::border-width
+B: GtkButton::default-border::left
+C: GtkButton::default-border::right
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0)
+I: GtkButton::default-border::top
+J: ythickness
+K: GtkButton::default-border::bottom
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0)
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0)
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0)
+
+
+II) !HAS_DEFAULT && (!GtkWidget::interior-focus || !HAVE_FOCUS)
+
++----------------------------------------------+
+|    		         		       |
+|                      I                       |
+|                                              |
+|   +--------------------------------------+   |
+|   |\\\\\\\\\\\\\\\\\ J //////////////////|   |
+|   |\+----------------------------------+/|   |
+|   |\|                E                 |/|   |
+|   |\| +------------------------------+ |/|   |
+|   |\| |############# F ##############| |/|   |
+|   |\| |#+--------------------------+#| |/|   |
+|   |\| |#|            L             |#| |/|   |
+|   |\| |#| +----------------------+ |#| |/|   |
+|   |\| |#| |                      | |#| |/|   |
+|   |\| |#| |                      | |#| |/|   |
+| B |D|E|F|G|        Child         |M|F|E|D| C |
+|   |/| |#| |                      | |#| |\|   |
+|   |/| |#| |                      | |#| |\|   |
+|   |/| |#| +----------------------+ |#| |\|   |
+|   |/| |#|            N             |#| |\|   |
+|   |/| |#+--------------------------+#| |\|   |
+|   |/| |############# F ##############| |\|   |
+|   |/| +------------------------------+ |\|   |
+|   |/|                E                 |\|   |
+|   |/+----------------------------------+\|   |
+|   |///////////////// J \\\\\\\\\\\\\\\\\\|   |
+|   +--------------------------------------+   |
+|                                              |
+|                      K                       |
+|                                              |
++----------------------------------------------+
+
+
+a) CAN_DEFAULT
+
+B: GtkContainer::border-width + GtkButton::default-outside-border::left
+C: GtkContainer::border-width + GtkButton::default-outside-border::right
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::left
+I: GtkContainer::border-width + GtkButton::default-outside-border::top
+J: ythickness
+K: GtkContainer::border-width + GtkButton::default-outside-border::bottom
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::top
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::right
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::bottom
+
+
+b) !CAN_DEFAULT
+
+B: GtkContainer::border-width
+C: GtkContainer::border-width
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0)
+I: GtkContainer::border-width
+J: ythickness
+K: GtkContainer::border-width
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0)
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0)
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0)
+
+
+
+
+III) HAS_DEFAULT && (GtkWidget::interior-focus && HAVE_FOCUS)
+
++----------------------------------------------+
+|    		       A 		       |
+| +------------------------------------------+ |
+| |@@@@@@@@@@@@@@@@@@@ I @@@@@@@@@@@@@@@@@@@@| |
+| |@+--------------------------------------+@| |
+| |@|################# F ##################|@| |
+| |@|#+----------------------------------+#|@| |
+| |@|#|                E                 |#|@| |
+| |@|#| +------------------------------+ |#|@| |
+| |@|#| |\\\\\\\\\\\\\ J //////////////| |#|@| |
+| |@|#| |\+--------------------------+/| |#|@| |
+| |@|#| |\|            L             |/| |#|@| |
+| |@|#| |\| +----------------------+ |/| |#|@| |
+| |@|#| |\| |                      | |/| |#|@| |
+| |@|#| |\| |                      | |/| |#|@| |
+|A|B|F|E|D|G|        Child         |M|D|E|F|C|A|
+| |@|#| |/| |                      | |\| |#|@| |
+| |@|#| |/| |                      | |\| |#|@| |
+| |@|#| |/| +----------------------+ |\| |#|@| |
+| |@|#| |/|            N             |\| |#|@| |
+| |@|#| |/+--------------------------+\| |#|@| |
+| |@|#| |///////////// J \\\\\\\\\\\\\\| |#|@| |
+| |@|#| +------------------------------+ |#|@| |
+| |@|#|                E                 |#|@| |
+| |@|#+----------------------------------+#|@| |
+| |@|################# F ##################|@| |
+| |@+--------------------------------------+@| |
+| |@@@@@@@@@@@@@@@@@@@ K @@@@@@@@@@@@@@@@@@@@| |
+| +------------------------------------------+ |
+|                      A                       |
++----------------------------------------------+
+
+A: GtkContainer::border-width
+B: GtkButton::default-border::left
+C: GtkButton::default-border::right
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0)
+I: GtkButton::default-border::top
+J: ythickness
+K: GtkButton::default-border::bottom
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0)
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0)
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0)
+
+
+IV) !HAS_DEFAULT && (GtkWidget::interior-focus && HAVE_FOCUS)
+
++----------------------------------------------+
+|    		         		       |
+|                      I                       |
+|                                              |
+|   +--------------------------------------+   |
+|   |################# J ##################|   |
+|   |#+----------------------------------+#|   |
+|   |#|                E                 |#|   |
+|   |#| +------------------------------+ |#|   |
+|   |#| |\\\\\\\\\\\\\ F //////////////| |#|   |
+|   |#| |\+--------------------------+/| |#|   |
+|   |#| |\|            L             |/| |#|   |
+|   |#| |\| +----------------------+ |/| |#|   |
+|   |#| |\| |                      | |/| |#|   |
+|   |#| |\| |                      | |/| |#|   |
+| B |D|E|F|G|        Child         |M|F|E|D| C |
+|   |#| |/| |                      | |\| |#|   |
+|   |#| |/| |                      | |\| |#|   |
+|   |#| |/| +----------------------+ |\| |#|   |
+|   |#| |/|            N             |\| |#|   |
+|   |#| |/+--------------------------+\| |#|   |
+|   |#| |///////////// F \\\\\\\\\\\\\\| |#|   |
+|   |#| +------------------------------+ |#|   |
+|   |#|                E                 |#|   |
+|   |#+----------------------------------+#|   |
+|   |################# J ##################|   |
+|   +--------------------------------------+   |
+|                                              |
+|                      K                       |
+|                                              |
++----------------------------------------------+
+
+
+a) CAN_DEFAULT
+
+B: GtkContainer::border-width + GtkButton::default-outside-border::left
+C: GtkContainer::border-width + GtkButton::default-outside-border::right
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::left
+I: GtkContainer::border-width + GtkButton::default-outside-border::top
+J: ythickness
+K: GtkContainer::border-width + GtkButton::default-outside-border::bottom
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::top
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::right
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0) +
+   (GtkButton::default-outside-border - GtkButton::default-outside-border)::bottom
+
+
+b) !CAN_DEFAULT
+
+B: GtkContainer::border-width
+C: GtkContainer::border-width
+D: xthickness
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-line-width
+G: CHILD_SPACING + (depressed ? GtkButton::child-displacement-x : 0)
+I: GtkContainer::border-width
+J: ythickness
+K: GtkContainer::border-width
+L: CHILD_SPACING + (depressed ? GtkButton::child-displacement-y : 0)
+M: CHILD_SPACING - (depressed ? GtkButton::child-displacement-x : 0)
+N: CHILD_SPACING - (depressed ? GtkButton::child-displacement-y : 0)
+
+
+======================
+
+GtkCheckButton
+
+======================
+
+Note: This is the draw_indicator=TRUE case; draw_indicator=FALSE
+      is like GtkButton)
+
+ Style properties
+
+   GtkWidget::interior_focus = TRUE
+   GtkWidget::focus_width = 1
+   GtkWidget::focus_padding = 0
+   GtkButton::indicator-size = 13
+   GtkButton::indicator-spacing = 2
+
+ Properties
+
+   GtkContainer::border_width = 0
+
+ #defines
+
+   CHILD_SPACING 1
+
+interior_focus
+
+ +-------------------------------------------+
+ |		               F             |
+ |	 G	  +------------------------+ |
+ |		  |########### D ##########| |
+ | +------------+ |#+--------------------+#| |
+ | |            | |#|	       E	 |#| |
+ | |            | |#| +----------------+ |#| |
+ | |            | |#| |		       | |#| |
+ |A|    BxB     |C|D|E|      Child     |E|#|F|
+ | |            | |#| |		       | |#| |
+ | |            | |#| +----------------+ |#| |
+ | |            | |#|	       E       	 |#| |
+ | +------------+ |#+--------------------+#| |
+ |		  |########### D ##########| |
+ |	G	  +------------------------+ |
+ |		               F             |
+ +-------------------------------------------+
+
+A: GtkContainer::border-width + GtkCheckButton::indicator-spacing
+B: GtkCheckButton::indicator-size
+C: 2 * GtkCheckButton::indicator-spacing
+D: GtkWidget::focus-line-width
+E: GtkWidget::focus-padding
+F: GtkContainer::border-width
+G: GtkConainer::border-width + GtkCheckButton::indicator-spacing
+
+!interior_focus
+
+ +-------------------------------------------+
+ |		     A                       |
+ | +---------------------------------------+ |
+ | |################ D ####################| |
+ | |#+-----------------------------------+#| |
+ | |#|       G                E          |#| |
+ | |#| +------------+  +---------------+ |#| |
+ | |#| |            |  |               | |#| |
+ | |#| |            |  |	       | |#| |
+ |A|D|F|    BxB     |C |      Child    |E|D|A|
+ | |#| |            |  |	       | |#| |
+ | |#| |            |  |               | |#| |
+ | |#| +------------+  +---------------+ |#| |
+ | |#|       G                E          |#| |
+ | |#+-----------------------------------+#| |
+ | |################ D ####################| |
+ | +---------------------------------------+ |
+ |		     A                       |
+ +-------------------------------------------+
+
+A: GtkContainer::border-width
+B: GtkCheckButton::indicator-size
+C: 2 * GtkCheckButton::indicator-spacing
+D: GtkWidget::focus-line-width
+E: GtkWidget::focus-padding
+F: GtkWidget::focus-padding + GtkCheckButton::indicator-spacing
+G: GtkWidget::focus-padding + GtkCheckButton::indicator-spacing
+
+===============
+
+GtkEntry
+
+===============
+
+ Style properties
+
+   GtkWidget::interior_focus = TRUE
+   GtkWidget::focus_width = 1
+   GtkWidget::focus_padding = 0
+
+ Properties
+
+   GtkContainer::border_width = 0
+
+ #defines
+
+   INNER_BORDER 2
+
+
+
+interior_focus
+
++--------------------------------------+
+|\\\\\\\\\\\\\\\\\ B //////////////////|
+|\+----------------------------------+/|
+|\|		   D 	       	     |/|
+|\| +------------------------------+ |/|
+|\| |		    	       	   | |/|
+|\| |  	       	       	       	   | |/|
+|A|D|  	       	    	       	   |D|A|
+|\| |		    		   | |/|
+|\| |		    		   | |/|
+|\| +------------------------------+ |/|
+|\| 		   D   		     |/|
+|\+----------------------------------+/|
+|///////////////// B \\\\\\\\\\\\\\\\\/|
++--------------------------------------+
+
+A: xthickness
+B: ythickness
+D: INNER_BORDER
+
+!interior_focus
+
++------------------------------------------+
+|####################C#####################|
+|#+--------------------------------------+#|
+|#|\\\\\\\\\\\\\\\\\ B //////////////////|#|
+|#|\+----------------------------------+/|#|
+|#|\|  	       	     D	       	       |/|#|
+|#|\| +------------------------------+ |/|#|
+|#|\| |		     	       	     | |/|#|
+|#|\| |  	       	       	     | |/|#|
+|C|A|D|  	       	    	     |D|A|C|
+|#|\| |		     		     | |/|#|
+|#|\| |		     		     | |/|#|
+|#|\| +------------------------------+ |/|#|
+|#|\| 		     D 	       	       |/|#|
+|#|\+----------------------------------+/|#|
+|#|///////////////// B \\\\\\\\\\\\\\\\\/|#|
+|#+--------------------------------------+#|
+|####################C#####################|
++------------------------------------------+
+
+A: xthickness
+B: ythickness
+C: GtkWidget::focus-line-width
+D: INNER_BORDER + (HAVE_FOCUS ? 0 : GtkWidget::focus-line-width
+
+Note - effect here for !interior_focus is that bevel moves in
+by focus-line-width when entry gains focus
+
+===============
+
+GtkExpander
+
+===============
+
+ Style properties
+  GtkWidget::focus_line_width
+  GtkWidget::focus_padding
+  GtkExpander::expander_size
+  GtkExpander::expander_spacing
+
+ Properties
+  GtkContainer::border_width
+  GtkExpander::spacing
+
+if (GTK_WIDGET_VISIBLE (bin->child) && interior_focus)
+
++-------------------------------------+
+|                  A                  |
+| +---------+-----------------------+ |
+| |    C    |##########E############| |
+| | +-----+ |#+-------------------+#| |
+| | |     | |#|        F          |#| |
+| | |     | |#| +---------------+ |#| |
+|A|C| BxB |C|E|F| label_widget  |F|E|A|
+| | |     | |#| +---------------+ |#| |
+| | |     | |#|        F          |#| |
+| | +-----+ |#+-------------------+#| |
+| |    C    |##########E############| |
+| +---------+-----------------------+ |
+| |                D                | |
+| +---------------------------------+ |
+| |                                 | |
+| |                                 | |
+| |                                 | |
+|A|             bin->child          |A|
+| |                                 | |
+| |                                 | |
+| |                                 | |
+| +---------------------------------+ |
+|                  A                  |
++-------------------------------------+
+
+ A: GtkContainer::border_width
+ B: GtkExpander::expander_size
+ C: GtkExpander::expander_spacing
+ D: GtkExpander::spacing
+ E: GtkWidget::focus_line_width
+ F: GtkWidget::focus_padding
+
+if (GTK_WIDGET_VISIBLE (bin->child) && !interior_focus)
+
++-------------------------------------------+
+|                    A                      |
+| +---------------------------------------+ |
+| |##################E####################| |
+| |#+-----------------------------------+#| |
+| |#|                F                  |#| |
+| |#| +---------+---------------------+ |#| |
+| |#| |    C    |                     | |#| |
+| |#| | +-----+ |                     | |#| |
+|A|E|F|C| BxB |C|    label_widget     |F|E|A|
+| |#| | +-----+ |                     | |#| |
+| |#| |    C    |                     | |#| |
+| |#| +---------+---------------------+ |#| |
+| |#|                F                  |#| |
+| |#+-----------------------------------+#| |
+| |##################E####################| |
+| +---------------------------------------+ |
+| |                  D                    | |
+| +---------------------------------------+ |
+| |                                       | |
+| |                                       | |
+| |                                       | |
+|A|               bin->child              |A|
+| |                                       | |
+| |                                       | |
+| |                                       | |
+| +---------------------------------------+ |
+|                     A                     |
++-------------------------------------------+
+
+ A: GtkContainer::border_width
+ B: GtkExpander::expander_size
+ C: GtkExpander::expander_spacing
+ D: GtkExpander::spacing
+ E: GtkWidget::focus_line_width
+ F: GtkWidget::focus_padding
+
+if (!GTK_WIDGET_VISIBLE (bin->child) && interior_focus)
+
++-------------------------------------+
+|                  A                  |
+| +---------+-----------------------+ |
+| |    C    |##########E############| |
+| | +-----+ |#+-------------------+#| |
+| | |     | |#|        F          |#| |
+| | |     | |#| +---------------+ |#| |
+|A|C| BxB |C|E|F| label_widget  |F|E|A|
+| | |     | |#| +---------------+ |#| |
+| | |     | |#|        F          |#| |
+| | +-----+ |#+-------------------+#| |
+| |    C    |##########E############| |
+| +---------+-----------------------+ |
+|                  A                  |
++-------------------------------------+
+
+ A: GtkContainer::border_width
+ B: GtkExpander::expander_size
+ C: GtkExpander::expander_spacing
+ E: GtkWidget::focus_line_width
+ F: GtkWidget::focus_padding
+
+if (!GTK_WIDGET_VISIBLE (bin->child) && !interior_focus)
+
++-------------------------------------------+
+|                    A                      |
+| +---------------------------------------+ |
+| |##################E####################| |
+| |#+-----------------------------------+#| |
+| |#|                F                  |#| |
+| |#| +---------+---------------------+ |#| |
+| |#| |    C    |                     | |#| |
+| |#| | +-----+ |                     | |#| |
+|A|E|F|C| BxB |C|     label_widget    |F|E|A|
+| |#| | +-----+ |                     | |#| |
+| |#| |    C    |                     | |#| |
+| |#| +---------+---------------------+ |#| |
+| |#|                F                  |#| |
+| |#+-----------------------------------+#| |
+| |##################E####################| |
+| +---------------------------------------+ |
+|                    A                      |
++-------------------------------------------+
+
+ A: GtkContainer::border_width
+ B: GtkExpander::expander_size
+ C: GtkExpander::expander_spacing
+ E: GtkWidget::focus_line_width
+ F: GtkWidget::focus_padding

docs/widget_system.txt

@@ -0,0 +1,500 @@
+Notes about the inner workings of the widget system of GTK
+==========================================================
+
+This file contains some notes as to how the widget system does
+and should work. It consists of three parts:
+
+ I) A description of the meaning of the various flags
+
+ II) A list of invariants about the states of the widgets. 
+    (Throughout this document, we refer to the states of the
+     widgets by referring to the flags for GtkWidget)
+
+ III) Some notes about the ways that a widget changes states
+
+ IV) A list of responsibilities of various widget signals when
+    the states change.
+
+Any action necessary to maintain the invariants in II which is not
+explicitly mentioned in IV), is the responsibility of the core GTK
+code, which is roughly defined as:
+
+  gtkobject.c
+  gtkwidget.c
+  gtkcontainer.c
+  gtkmain.c
+  gtksignal.c
+
+Section II is mostly of interest to those maintaining GTK, the
+other sections may also be interesting to people writing
+new widgets.
+
+Main outline:
+	- Owen Taylor <owt1@cornell.edu>
+	  1998/02/03
+
+Flag descriptions:
+	- Tim Janik <timj@gimp.org>
+	  1998/02/04
+
+I. Flags
+--------
+
+GtkObject:
+
+GTK_DESTROYED:
+	This flagged is set for a GtkObject right before its
+	destruction code is executed. Its main use is the
+	prevention of multiple destruction invocations.
+	
+GTK_FLOATING:
+	This flag reflects the fact that the holder of the
+	initial reference count is unknown. Refer to refcounting.txt
+	for further details.
+
+GTK_RESERVED_1:
+GTK_RESERVED_2:
+	Reserved flags.
+
+
+GtkWidget, public flags:
+
+GTK_TOPLEVEL:
+	Widgets without a real parent, as there are GtkWindows and
+	GtkMenus have this flag set throughout their lifetime.
+	Toplevel widgets always contain their own GdkSurface.
+	
+GTK_NO_WINDOW:
+	This flag is indicative for a widget that does not provide
+	its own GdkSurface. Visible action (e.g. drawing) is performed
+	on the parent's GdkSurface.
+
+GTK_REALIZED:
+	Set by gtk_widget_realize, unset by gtk_widget_unrealize.
+	Relies on ((widget->parent && widget->parent->window)
+	           || GTK_WIDGET_TOPLEVEL (widget));
+	Means: widget has an associated GdkSurface (XWindow).
+
+GTK_MAPPED:
+	Set by gtk_widget_map, unset by gtk_widget_unmap.
+	May only be set if GTK_WIDGET_REALIZED (widget).
+	Means: gdk_surface_show() has been called on the widgets window(s).
+
+GTK_VISIBLE:
+	Set by gtk_widget_show.
+	Implies that a widget will be flagged GTK_MAPPED as soon as its
+	parent is mapped.
+!GTK_VISIBLE:
+	Set by gtk_widget_hide.
+	Implies that a widget is not onscreen, therefore !GTK_MAPPED.
+
+GTK_CHILD_VISIBLE
+        Set by gtk_widget_set_child_visible, and if FALSE indicates that 
+        the widget should not be mapped even if the parent is mapped
+        and visible. Containers like GtkNotebook use this flag.
+        A private flag, not a public flag, so if you need to check
+        this flag, you should call gtk_widget_get_child_visible().
+        (Should be very rarely necessary.)
+
+GTK_SENSITIVE:
+	Set and unset by gtk_widget_set_sensitive.
+	The sensitivity of a widget determines whether it will receive
+	certain events (e.g. button or key presses). One premise for
+	the widgets sensitivity is to have GTK_SENSITIVE set.
+
+GTK_PARENT_SENSITIVE:
+	Set and unset by gtk_widget_set_sensitive operations on the
+	parents of the widget.
+	This is the second premise for the widgets sensitivity. Once
+	it has GTK_SENSITIVE and GTK_PARENT_SENSITIVE set, its state is
+	effectively sensitive. This is expressed (and can be examined) by
+	the GTK_WIDGET_IS_SENSITIVE macro.
+
+GTK_CAN_FOCUS:
+	There are no directly corresponding functions for setting/unsetting
+	this flag, but it can be affected by the GtkWidget::has_focus argument
+	via gtk_widget_set_arg.
+	This flag determines whether a widget is able to handle focus grabs.
+
+GTK_HAS_FOCUS:
+	This flag will be set by gtk_widget_grab_focus for widgets that also
+	have GTK_CAN_FOCUS set. The flag will be unset once another widget
+	grabs the focus.
+	
+GTK_CAN_DEFAULT:
+GTK_HAS_DEFAULT:
+	These two flags are mostly equal in functionality to their *_FOCUS
+	counterparts, but for the default widget.
+
+GTK_HAS_GRAB:
+	Set by gtk_grab_add, unset by gtk_grab_remove.
+	Means: widget is in the grab_widgets stack, and will be the preferred
+	one for receiving events other than ones of cosmetic value.
+
+GTK_BASIC:
+	The GTK_BASIC flag is an attempt at making a distinction
+	between widgets that handle user input e.g. key/button presses
+	and those that don't. Subsequent parent<->child relation ships
+	of non `basic' widgets should be avoided. The checking for
+	this is currently not properly enforced in the code. For
+	example GtkButton is a non `basic' widget, that will therefore
+	disallow to act as a container for another GtkButton. Now the
+	gnit is, one can add a GtkHBox (which is a `basic' widget) to
+	the first button, and put the second into the box.
+
+GTK_RESERVED_3:
+
+GTK_RC_STYLE:
+	This flag indicates that its style has been looked up through
+	the rc mechanism. It does not imply that the widget actually
+	had a style defined through the rc mechanism.
+
+
+GtkWidget, private flags:
+
+GTK_USER_STYLE:
+	A widget is flagged to have a user style, once gtk_widget_set_style
+	has been invoked for it. The use of this flag is to tell widgets
+	which share a global user style from the ones which got a certain
+	style assign from outside the toolkit.
+	
+GTK_RESIZE_PENDING:
+	First, this is only valid for GtkContainers.
+	[some of the code should move to gtkcontainer.c therefore]
+	Relies on GTK_WIDGET_REALIZED(widget)
+	[this is not really enforced throughout the code, but should
+	 be. it only requires a few checks for GTK_WIDGET_REALIZED and
+	 minor changes to gtk_widget_unrealize, we can then remove the check
+	 in gtk_widget_real_destroy]
+	Means: there is an idle handler waiting for the container to
+	resize it.
+
+GTK_RESIZE_NEEDED:
+	Relies on GTK_WIDGET_REALIZED(widget)
+	[this is not really enforced throughout the code, but should
+	 be. once this is done special checking in gtk_widget_real_destroy
+	 can be avoided]
+	Means: a widget has been added to the resize_widgets list of
+	its _toplevel_ container (keep this in mind for GtkViewport).
+	Remark: this flag is also used internally by gtkwindow.c during
+	the evaluation of resizing worthy widgets.
+
+GTK_LEAVE_PENDING:
+	A widget is flagged as such if there is a leave_notify event
+	pending for it. It will receive this event regardless of a grab
+	through another widget or its current sensitivity.
+	[this should be made relying on GTK_REALIZED]
+
+GTK_HAS_SHAPE_MASK:
+	Set by gtk_widget_shape_combine_mask if a widget got a shape mask
+	assigned (making use of the X11 shaped window extension).
+
+GTK_IN_REPARENT:
+	During the act of reparentation widgets which are already
+	realized and will be added to an already realized parent need
+	to have this flag set to prevent natural unrealization on the
+	process of getting unparented.
+
+GTK_NEED_REQUEST:
+	This flag is set if the widget doesn't have an up to date 
+	requisition. If this flag is set, we must actually emit ::size-request
+        when gtk_widget_size_request() is called. Otherwise, we can
+        simply widget->requisition. We keep track of this all the time
+        however, widgets with this flag set are only added to the resize 
+	queue if they are viewable.
+
+GTK_NEED_ALLOCATION:
+	This flag is set if the widget doesn't have an up to date 
+	allocation. If this flag is set, we must actually emit ::size-allocate
+        when gtk_widget_size_allocate() is called, even if the new allocation
+        is the same as the current allocation.
+ 
+Related Macros:
+
+GTK_WIDGET_DRAWABLE:
+	This macro examines whether a widget is flagged as GTK_WIDGET_VISIBLE
+	and GTK_WIDGET_MAPPED.
+	Means: it _makes sense_ to draw in a widgets window.
+
+GTK_WIDGET_IS_SENSITIVE:
+	This macro tells the real sensitivity state of a widget. It returns
+	whether both the widget and all its parents are in sensitive state.
+
+
+II. Invariants:
+---------------
+
+This section describes various constraints on the states of 
+the widget:
+
+In the following
+
+  A => B     means  if A is true, than B is true
+  A <=> B    means  A is true, if and only if B is true
+                    (equivalent to A => B and A <= B)
+
+
+1)  GTK_WIDGET_DESTROYED (widget) => !GTK_WIDGET_REALIZED (widget)
+                                  => !GTK_WIDGET_VISIBLE (widget)
+[ The latter is not currently in place, but it should be ] 
+ 
+2) GTK_WIDGET_MAPPED (widget) => GTK_WIDGET_REALIZED (widget)
+
+3) if GTK_WIDGET_TOPLEVEL (widget):
+   GTK_WIDGET_VISIBLE (widget) <=> GTK_WIDGET_MAPPED (widget)
+
+4) if !GTK_WIDGET_TOPLEVEL (widget):
+  widget->parent && GTK_WIDGET_REALIZED (widget->parent) <=>
+     GTK_WIDGET_REALIZED (widget)
+
+5) if !GTK_WIDGET_TOPLEVEL (widget):
+
+   GTK_WIDGET_MAPPED (widget) => GTK_WIDGET_VISIBLE (widget)
+                              => GTK_WIDGET_CHILD_VISIBLE (widget)
+                              => GTK_WIDGET_REALIZED (widget)
+
+   widget->parent && GTK_WIDGET_MAPPED (widget->parent) && 
+     GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_CHILD_VISIBLE 
+       <=> GTK_WIDGET_MAPPED (widget)
+
+Note:, the definition
+
+[  GTK_WIDGET_DRAWABLE = GTK_WIDGET_VISIBLE && GTK_WIDGET_MAPPED
+   is made in gtkwidget.h, but by 3) and 5), 
+     
+      GTK_WIDGET_MAPPED => GTK_WIDGET_VISIBLE
+]
+
+6) GTK_REDRAW_PENDING => GTK_WIDGET_REALIZED
+   GTK_RESIZE_PENDING =>         "
+   GTK_LEAVE_PENDING  =>         "
+   GTK_RESIZE_NEEDED  =>         "
+
+III. How states are changed:
+----------------------------
+
+How can the user control the state of a widget:
+-----------------------------------------------
+
+(In the following, set flag means set the flag, do appropriate
+actions, and enforce above invariants) 
+
+gtk_widget_show: 
+ if !GTK_DESTROYED sets GTK_VISIBLE
+
+gtk_widget_hide:
+ if !GTK_VISIBLE for widget
+
+gtk_widget_destroy:
+ sets GTK_DESTROYED
+ For a top-level widget
+
+gtk_widget_realize:
+ if !GTK_DESTROYED sets GTK_REALIZED
+- Calling gtk_widget_realize when the widget is not a descendant
+  of a toplevel is an ERROR.
+
+gtk_container_add (container, widget) [ and container-specific variants ]
+ Sets widget->parent 
+
+gtk_container_remove (container, widget)
+ unsets widget->parent
+
+gtk_widget_reparent (widget, new_parent)
+ Equivalent to removing widget from old parent and adding it to
+ the new parent, except that the widget will not be temporarily 
+ unrealized if both the old parent and the new parent are realized.
+
+
+gtk_widget_unrealize
+gtk_widget_map
+gtk_widget_unmap
+
+These functions are not meant to be used by applications - they
+are used only by GTK and widgets to enforce invariants on the
+state.
+
+When The X window corresponding to a GTK window is destroyed:
+-------------------------------------------------------------
+
+gtk_widget_destroy is called (as above).
+
+
+
+IV. Responsibilities of widgets
+--------------------------------
+
+Adding to a container
+---------------------
+
+When a widget is added to a container, the container:
+
+  1) calls gtk_widget_set_parent_surface (widget, window) if 
+     the widget is being added to something other than container->window
+  2) calls gtk_widget_set_parent (widget, container)
+
+Removing from a container
+-------------------------
+
+When a widget is removed to a container, the container:
+
+  1) Calls gtk_widget_unparent (widget)
+  2) Queues a resize.
+
+Notes:
+
+ gtk_widget_unparent unrealizes the widget except in the 
+   special case GTK_IN_REPARENT is set.
+
+
+At widget creation
+------------------
+
+Widgets are created in an unrealized state. 
+
+ 1) The widget should allocate and initialize needed data structures
+
+
+The Realize signal
+------------------
+
+When a widget receives the "realize" signal it should:
+
+ NO_WINDOW widgets: (probably OK to use default handler)
+
+  1) set the realized flag
+  2) set widget->window
+      widget->window = gtk_widget_get_parent_surface (widget);
+      g_object_ref (widget->window);
+  3) attach the widget's style
+
+  widget->style = gtk_style_attach (widget->style, widget->window);
+
+ widget with window(s)
+
+  1) set the REALIZED flag
+  2) create windows with the parent obtained from
+      gtk_widget_get_parent_surface (widget);
+  3) attach the widget's style
+  4) set the background color for the new window based on the style
+
+The Map signal
+--------------
+
+  1) Set the MAPPED flag
+  2) If the widget has any windows, gdk_surface_show those windows
+  3) call gtk_widget_map for all child widgets that are 
+     VISIBLE, CHILD_VISIBLE and !MAPPED. (A widget will only
+     be !CHILD_VISIBLE if the container set it that way, so
+     most containers will not have to check this.)
+  3) Do any other functions related to putting the widget onscreen.
+     (for instance, showing extra popup windows...)
+
+The Unmap signal
+----------------
+
+When a widget receives the unmap signal, it must:
+
+ 1) If the widget has a window, gdk_surface_hide that window, 
+ 2) If the widget does not have a window, unmap all child widgets
+ 3) Do any other functions related to taking the widget offscreen
+     (for instance, removing popup windows...)
+ 4) Unset GTK_MAPPED
+
+
+The Unrealize signal
+--------------------
+
+When a widget receives the unrealize signal, it must
+
+ 1) For any windows other than widget->window do:
+
+    gdk_surface_set_user_data (window, NULL);
+    gdk_surface_destroy (window);
+
+ 2) Call the parent's unrealize handler
+
+
+The Widget class unrealize handler will take care of unrealizing
+all children if necessary. [should this be made consistent with
+unmap???]
+
+
+The Destroy Signal
+------------------
+
+Commentary:
+
+  The destroy signal probably shouldn't exist at all. A widget
+  should merely be unrealized and removed from its parent
+  when the user calls gtk_widget_destroy or a GDK_DESTROY event
+  is received. However, a large body of code depends on
+  getting a definitive signal when a widget goes away.
+
+  That could be put in the finalization step, but, especially
+  with language bindings, the cleanup step may need to refer
+  back to the widget. (To use gtk_widget_get_data, for instance)
+  If it does so via a pointer in a closure (natural for
+  Scheme, or Perl), then the finalization procedure will never
+  be called. 
+
+  Also, if we made that the finalization step, we would have
+  to propagate the GDK_DESTROY event in any case, since it is
+  at that point at which user-visible actions need to be taken.
+
+
+When a widget receives the destroy signal, it must:
+
+  1) If the widget "owns" any widgets other than its child
+     widgets, (for instance popup windows) it should
+     call gtk_widget_destroy () for them.
+
+  2) Call the parent class's destroy handler.
+
+
+The "destroy" signal will only be received once. A widget
+will never receive any other signals after the destroy
+signal (but see the section on "Finalize" below)
+
+The widget must handle calls to all publically accessible
+functions in an innocuous manner even after a "destroy"
+signal. (A widget can assume that it will not be realized 
+after a "destroy" signal is received, which may simplify
+handling this requirement)
+
+
+The Finalize Pseudo-signal
+--------------------------
+
+The finalize pseudo-signal is received after all references
+to the widget have been removed. The finalize callback
+cannot make any GTK calls with the widget as a parameter.
+
+1) Free any memory allocated by the widget. (But _not_
+   the widget structure itself.
+
+2) Call the parent class's finalize signal
+
+
+A note on chaining "destroy" signals and finalize signals:
+---------------------------------------------------------
+
+This is done by code like:
+
+  if (GTK_OBJECT_CLASS (parent_class)->destroy)
+    (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+It may not be completely obvious why this works. Note
+that parent_class is a static variable on a per-class
+basis. So say: we have
+
+  GtkFoo <- GtkBar <- GtkWidget <-GtkObject
+
+And that Foo, Widget, and Object all have destructors, but
+not Bar.
+
+Then gtk_foo_destroy will call gtk_widget_destroy (because
+it was not overridden in the Bar class structure) and
+gtk_widget_destroy will call gtk_object_destroy because
+the parent_class variable referenced by gtk_foo_destroy is the 
+static variable in gtkwidget.c: GtkObjectClass.

gdk/broadway/gdkbroadwaycursor.h

@@ -25,8 +25,8 @@
 #ifndef __GDK_BROADWAY_CURSOR_H__
 #define __GDK_BROADWAY_CURSOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_CURSOR_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_CURSOR))
 #define GDK_BROADWAY_CURSOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_CURSOR, GdkBroadwayCursorClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayCursor GdkBroadwayCursor;
 #else
 typedef GdkCursor GdkBroadwayCursor;

gdk/broadway/gdkbroadwaydisplay.h

@@ -18,15 +18,15 @@
 #ifndef __GDK_BROADWAY_DISPLAY_H__
 #define __GDK_BROADWAY_DISPLAY_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDisplay GdkBroadwayDisplay;
 #else
 typedef GdkDisplay GdkBroadwayDisplay;

gdk/broadway/gdkbroadwaydisplaymanager.h

@@ -20,8 +20,8 @@
 #ifndef __GDK_BROADWAY_DISPLAY_MANAGER_H__
 #define __GDK_BROADWAY_DISPLAY_MANAGER_H__
 
-#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined(__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
@@ -31,7 +31,7 @@ G_BEGIN_DECLS
 #define GDK_TYPE_BROADWAY_DISPLAY_MANAGER    (gdk_broadway_display_manager_get_type ())
 #define GDK_BROADWAY_DISPLAY_MANAGER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_DISPLAY_MANAGER, GdkBroadwayDisplayManager))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDisplayManager GdkBroadwayDisplayManager;
 #else
 typedef GdkDisplayManager _GdkBroadwayDisplayManager;

gdk/broadway/gdkbroadwaymonitor.h

@@ -22,8 +22,8 @@
 #ifndef __GDK_BROADWAY_MONITOR_H__
 #define __GDK_BROADWAY_MONITOR_H__
 
-#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/broadway/gdkbroadway.h> can be included directly."
+#if !defined (__GDKBROADWAY_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkbroadway.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>

gdk/broadway/gdkbroadwaysurface.h

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define GDK_IS_BROADWAY_SURFACE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_SURFACE))
 #define GDK_BROADWAY_SURFACE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_SURFACE, GdkBroadwaySurfaceClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwaySurface GdkBroadwaySurface;
 #else
 typedef GdkSurface GdkBroadwaySurface;

gdk/broadway/gdkdnd-broadway.c

@@ -41,7 +41,7 @@
 #define GDK_IS_BROADWAY_DRAG_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_DRAG))
 #define GDK_BROADWAY_DRAG_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_DRAG, GdkBroadwayDragClass))
 
-#ifdef GTK_COMPILATION
+#ifdef GDK_COMPILATION
 typedef struct _GdkBroadwayDrag GdkBroadwayDrag;
 #else
 typedef GdkDrag GdkBroadwayDrag;

gdk/broadway/gdksurface-broadway.c

@@ -710,7 +710,7 @@ gdk_broadway_surface_set_icon_name (GdkSurface   *surface,
 }
 
 static void
-gdk_broadway_surface_minimize (GdkSurface *surface)
+gdk_broadway_surface_iconify (GdkSurface *surface)
 {
   if (GDK_SURFACE_DESTROYED (surface) ||
       !SURFACE_IS_TOPLEVEL (surface))
@@ -718,7 +718,7 @@ gdk_broadway_surface_minimize (GdkSurface *surface)
 }
 
 static void
-gdk_broadway_surface_unminimize (GdkSurface *surface)
+gdk_broadway_surface_deiconify (GdkSurface *surface)
 {
   if (GDK_SURFACE_DESTROYED (surface) ||
       !SURFACE_IS_TOPLEVEL (surface))
@@ -1413,8 +1413,8 @@ gdk_broadway_surface_class_init (GdkBroadwaySurfaceClass *klass)
   impl_class->set_focus_on_map = gdk_broadway_surface_set_focus_on_map;
   impl_class->set_icon_list = gdk_broadway_surface_set_icon_list;
   impl_class->set_icon_name = gdk_broadway_surface_set_icon_name;
-  impl_class->minimize = gdk_broadway_surface_minimize;
-  impl_class->unminimize = gdk_broadway_surface_unminimize;
+  impl_class->iconify = gdk_broadway_surface_iconify;
+  impl_class->deiconify = gdk_broadway_surface_deiconify;
   impl_class->stick = gdk_broadway_surface_stick;
   impl_class->unstick = gdk_broadway_surface_unstick;
   impl_class->maximize = gdk_broadway_surface_maximize;

gdk/broadway/meson.build

@@ -57,7 +57,7 @@ libgdk_broadway = static_library('gdk-broadway',
   gdk_broadway_sources, gdkconfig, gdkenum_h,
   include_directories: [confinc, gdkinc],
   c_args: [
-    '-DGTK_COMPILATION',
+    '-DGDK_COMPILATION',
     '-DG_LOG_DOMAIN="Gdk"',
   ] + common_cflags,
   link_args: common_ldflags,
@@ -71,6 +71,6 @@ executable('gtk4-broadwayd',
   clienthtml_h, broadwayjs_h,
   'broadwayd.c', 'broadway-server.c', 'broadway-output.c',
   include_directories: [confinc, gdkinc, include_directories('.')],
-  c_args: ['-DGTK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
+  c_args: ['-DGDK_COMPILATION', '-DG_LOG_DOMAIN="Gdk"', ],
   dependencies : [broadwayd_syslib, gdk_deps],
   install : true)

gdk/filetransferportal.c

@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2018 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <gio/gio.h>
-
-#ifdef G_OS_UNIX
-
-#include <gio/gunixfdlist.h>
-
-#ifndef O_PATH
-#define O_PATH 0
-#endif
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#else
-#define HAVE_O_CLOEXEC 1
-#endif
-
-#include "filetransferportalprivate.h"
-
-static GDBusProxy *file_transfer_proxy = NULL;
-
-static GDBusProxy *
-ensure_file_transfer_portal (void)
-{
-  if (file_transfer_proxy == NULL)
-    {
-      GError *error = NULL;
-
-      file_transfer_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-                                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES
-                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS
-                                                           | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-                                                           NULL,
-                                                           "org.freedesktop.portal.Documents",
-                                                           "/org/freedesktop/portal/documents",
-                                                           "org.freedesktop.portal.FileTransfer",
-                                                           NULL, &error);
-
-      if (error)
-        {
-          g_debug ("Failed to get proxy: %s", error->message);
-          g_error_free (error);
-        }
-    }
-
-  if (file_transfer_proxy)
-    {
-      char *owner = g_dbus_proxy_get_name_owner (file_transfer_proxy);
-
-      if (owner)
-        {
-          g_free (owner);
-          return file_transfer_proxy;
-        }
-    }
-
-  return NULL;
-}
-
-gboolean
-file_transfer_portal_available (void)
-{
-  gboolean available;
-
-  ensure_file_transfer_portal ();
-
-  available = file_transfer_proxy != NULL;
-
-  g_clear_object (&file_transfer_proxy);
-
-  return available;
-}
-
-typedef struct {
-  GTask *task;
-  const char **files;
-  int len;
-  int start;
-} AddFileData;
-
-static void add_files (GDBusProxy  *proxy,
-                       AddFileData *afd);
-
-static void
-add_files_done (GObject      *object,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
-  GError *error = NULL;
-  GVariant *ret;
-
-  ret = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, NULL, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (afd->task, error);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  g_variant_unref (ret);
-
-  if (afd->start >= afd->len)
-    {
-      g_task_return_boolean (afd->task, TRUE);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  add_files (proxy, afd);
-}
-
-/* We call AddFiles in chunks of 16 to avoid running into
- * the per-message fd limit of the bus.
- */
-static void
-add_files (GDBusProxy  *proxy,
-           AddFileData *afd)
-{
-  GUnixFDList *fd_list;
-  GVariantBuilder fds;
-  int i;
-  char *key;
-
-  g_variant_builder_init (&fds, G_VARIANT_TYPE ("ah"));
-  fd_list = g_unix_fd_list_new ();
-
-  for (i = 0; afd->files[afd->start + i]; i++)
-    {
-      int fd;
-      int fd_in;
-      GError *error = NULL;
-
-      if (i == 16)
-        break;
-
-      fd = open (afd->files[afd->start + i], O_PATH | O_CLOEXEC);
-      if (fd == -1)
-        {
-          g_task_return_new_error (afd->task, G_IO_ERROR, g_io_error_from_errno (errno),
-                                   "Failed to open %s", afd->files[afd->start + i]);
-          g_object_unref (afd->task);
-          g_free (afd);
-          g_object_unref (fd_list);
-          return;
-         }
-
-#ifndef HAVE_O_CLOEXEC
-      fcntl (fd, F_SETFD, FD_CLOEXEC);
-#endif
-      fd_in = g_unix_fd_list_append (fd_list, fd, &error);
-      close (fd);
-
-      if (fd_in == -1)
-        {
-          g_task_return_error (afd->task, error);
-          g_object_unref (afd->task);
-          g_free (afd);
-          g_object_unref (fd_list);
-          return;
-        }
-
-      g_variant_builder_add (&fds, "h", fd_in);
-    }
-
-   afd->start += 16;
-
-  key = (char *)g_object_get_data (G_OBJECT (afd->task), "key");
-
-  g_dbus_proxy_call_with_unix_fd_list (proxy,
-                                       "AddFiles",
-                                       g_variant_new ("(sah)", key, &fds),
-                                       0, -1,
-                                       fd_list,
-                                       NULL,
-                                       add_files_done, afd);
-
-  g_object_unref (fd_list);
-}
-
-static void
-start_session_done (GObject      *object,
-                    GAsyncResult *result,
-                    gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  AddFileData *afd = data;
-  GError *error = NULL;
-  GVariant *ret;
-  const char *key;
-
-  ret = g_dbus_proxy_call_finish (proxy, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (afd->task, error);
-      g_object_unref (afd->task);
-      g_free (afd);
-      return;
-    }
-
-  g_variant_get (ret, "(&s)", &key);
-
-  g_object_set_data_full (G_OBJECT (afd->task), "key", g_strdup (key), g_free);
-
-  g_variant_unref (ret);
-
-  add_files (proxy, afd);
-}
-
-void
-file_transfer_portal_register_files (const char          **files,
-                                     gboolean              writable,
-                                     GAsyncReadyCallback   callback,
-                                     gpointer              data)
-{
-  GTask *task;
-  GDBusProxy *proxy;
-  AddFileData *afd;
-  GVariantBuilder options;
-
-  task = g_task_new (NULL, NULL, callback, data);
-
-  proxy = ensure_file_transfer_portal ();
-
-  if (proxy == NULL)
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               "No portal found");
-      g_object_unref (task);
-      return;
-    }
-
-  afd = g_new (AddFileData, 1);
-  afd->task = task;
-  afd->files = files;
-  afd->len = g_strv_length ((char **)files);
-  afd->start = 0;
-
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-  g_variant_builder_add (&options, "{sv}", "writable", g_variant_new_boolean (writable));
-  g_variant_builder_add (&options, "{sv}", "autostop", g_variant_new_boolean (TRUE));
-
-  g_dbus_proxy_call (proxy, "StartTransfer",
-                     g_variant_new ("(a{sv})", &options),
-                     0, -1, NULL, start_session_done, afd);
-}
-
-gboolean
-file_transfer_portal_register_files_finish (GAsyncResult  *result,
-                                            char         **key,
-                                            GError       **error)
-{
-  if (g_task_propagate_boolean (G_TASK (result), error))
-    {
-      *key = g_strdup (g_object_get_data (G_OBJECT (result), "key"));
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-retrieve_files_done (GObject      *object,
-                     GAsyncResult *result,
-                     gpointer      data)
-{
-  GDBusProxy *proxy = G_DBUS_PROXY (object);
-  GTask *task = data;
-  GError *error = NULL;
-  GVariant *ret;
-  char **files;
-
-  ret = g_dbus_proxy_call_finish (proxy, result, &error);
-  if (ret == NULL)
-    {
-      g_task_return_error (task, error);
-      g_object_unref (task);
-      return;
-    }
-
-  g_variant_get (ret, "(^a&s)", &files);
-
-  g_object_set_data_full (G_OBJECT (task), "files", g_strdupv (files), (GDestroyNotify)g_strfreev);
-
-  g_variant_unref (ret);
-
-  g_task_return_boolean (task, TRUE);
-}
-
-void
-file_transfer_portal_retrieve_files (const char          *key,
-                                     GAsyncReadyCallback  callback,
-                                     gpointer             data)
-{
-  GDBusProxy *proxy;
-  GTask *task;
-  GVariantBuilder options;
-
-  task = g_task_new (NULL, NULL, callback, data);
-
-  proxy = ensure_file_transfer_portal ();
-
-  if (proxy == NULL)
-    {
-      g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                               "No portal found");
-      g_object_unref (task);
-      return;
-    }
-
-  g_variant_builder_init (&options, G_VARIANT_TYPE_VARDICT);
-  g_dbus_proxy_call (proxy,
-                     "RetrieveFiles",
-                     g_variant_new ("(sa{sv})", key, &options),
-                     0, -1, NULL,
-                     retrieve_files_done, task);
-}
-
-gboolean
-file_transfer_portal_retrieve_files_finish (GAsyncResult   *result,
-                                            char         ***files,
-                                            GError        **error)
-{
-  if (g_task_propagate_boolean (G_TASK (result), error))
-    {
-      *files = g_strdupv (g_object_get_data (G_OBJECT (result), "files"));
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-#endif /* G_OS_UNIX */

gdk/filetransferportalprivate.h

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2018 Matthias Clasen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FILE_TRANSFER_PROTOCOL_H__
-#define __FILE_TRANSFER_PROTOCOL_H__
-
-
-gboolean file_transfer_portal_available             (void);
-void     file_transfer_portal_register_files        (const char           **files,
-                                                     gboolean               writable,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               data);
-gboolean file_transfer_portal_register_files_finish (GAsyncResult          *result,
-                                                     char                 **key,
-                                                     GError               **error);
-
-void     file_transfer_portal_retrieve_files        (const char            *key,
-                                                     GAsyncReadyCallback    callback,
-                                                     gpointer               data);
-gboolean file_transfer_portal_retrieve_files_finish (GAsyncResult          *result,
-                                                     char                ***files,
-                                                     GError               **error);
-
-
-#endif

gdk/gdk-autocleanup.h

@@ -15,7 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkapplaunchcontext.h

@@ -21,7 +21,7 @@
 #ifndef __GDK_APP_LAUNCH_CONTEXT_H__
 #define __GDK_APP_LAUNCH_CONTEXT_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcairo.h

@@ -18,7 +18,7 @@
 #ifndef __GDK_CAIRO_H__
 #define __GDK_CAIRO_H__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 

gdk/gdkcairocontext.h

@@ -21,7 +21,7 @@
 #ifndef __GDK_CAIRO_CONTEXT__
 #define __GDK_CAIRO_CONTEXT__
 
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif