testdnd2: Don't pass a toplevel to gtk_drag_set_icon_widget

label: Remove angle property
label: Move if statement where it makes sense
2017-04-25 18:47:42 +02:00 · 2017-04-25 17:42:02 +02:00 · 2017-04-25 17:29:41 +02:00 · 2017-04-25 17:29:41 +02:00 · 2017-04-25 17:29:41 +02:00 · 2017-04-25 17:29:41 +02:00
812 changed files with 119368 additions and 127696 deletions
@@ -1,3 +1,133 @@
+Overview of Changes in GTK+ 3.90.0
+==================================
+
+* Allow a custom renderer for the inspector, by setting GTK_INSPECTOR_RENDERER
+
+* Move more container functionality, such as focus handling, to GtkWidget
+
+* Bugs fixed:
+ 686838 gtk_enumerate_printers() hangs
+ 778853 propagate-natural-width/height request too much with !overlay-scrolling...
+ 779081 GtkTextView: expose API to get Pango line direction
+ 780019 gtk+3 3.22.10 does not compile on macOS Yosemite
+ 780234 gtk_print_job_set_page_ranges() has unclear ownership transfer
+ 734946 Implement GContentType on OSX
+ 773228 third parameter of gtk_widget_intersect not listed as 'out'
+ 774148 Gtk.Popover misplacement in Wayland
+ 780735 flowbox: don’t select when rubberbanding over nothing
+        fix flicker caused by buffer age
+        fix hi-dpi fallback rendering
+        force window titles to be valid UTF8
+
+* Translation updates:
+ Friulian
+ German
+ Indonesian
+ Latvian
+ Polish
+ Russian
+
+
+Overview of Changes in GTK+ 3.89.5
+==================================
+
+* Convert many more widgets to use gtk_widget_measure for size allocation
+
+* gtk3-demo: Add an example for touchpad swipe handling
+
+* Theme: Improve styling for flow boxes
+
+* Quartz:
+ - Support fullscreen CSD windows
+ - Implement backdrop
+ - Implement gdk_window_set_functions
+
+* Bugs fixed:
+ 136059 Ctrl-navigation works in opposite direction in right-to-left text
+ 734946 Implement GContentType on OSX
+ 772505 Wayland: menu does not resize after disabling an action
+ 776821 Scale factor not properly propagated upon reparent
+ 778019 Key repeat under wayland behaves differently, making keyboard navigation...
+ 778203 icon shown at top left corner when dnd begins
+ 778534 Widget: Document signal mnemonic-activate
+ 778678 gtkshow: Prefer gtk_show_uri_on_window() which works for sandboxed apps
+ 778726 Use gtk_show_uri_on_window()
+ 778746 Rename popover is sometimes misplaced
+ 779073 style flowbox tiles
+ 779074 style selectionmode checkboxes for flowbox
+ 779147 Inspector: Use Title Case for labels & menu items
+ 779317 gtk_pad_controllerpad_set_action issue with incorrect assert
+ 779374 Unprovoked key repeat in gnome-terminal after in 3.22.9
+ 779383 quartz: Let CSD windows be fullscreen
+ 779392 Implement backdrop for Quartz
+
+* Translation updates:
+ Basque
+ Brazilian Portuguese
+ Catalan
+ Chinese
+ Chinese (Taiwan)
+ Czech
+ Danish
+ Finnish
+ French
+ Friulian
+ Galician
+ German
+ Hungarian
+ Icelandic
+ Indonesian
+ Italian
+ Kazakh
+ Korean
+ Lithuanian
+ Norwegian bokmål
+ Polish
+ Scottish Gaelic
+ Serbian
+ Slovak
+ Spanish
+ Swedish
+
+
+Overview of Changes in GTK+ 3.89.4
+==================================
+
+* API changes
+ - gtk_init and other init functions no longer take commandline arguments
+ - Functions that are only useful with commandline arguments have been dropped
+ - Widgets, except for toplevels, are now visible by default
+ - Style properties are no longer supported
+
+* Vulkan rendrerer
+ - Implement more clipping
+
+* CSS
+ - Specifying px for pixels is now required
+
+* Bugs fixed:
+ 358970 gtk_scale_set_digits does not cause value to be rounded if draw-value...
+ 770112 The documented <alt>left shortcut doesn’t work on Wayland
+ 773299 Ensure GTK+-4.x builds and works on Windows (MSVC in particular)
+ 773686 Software when launched shows in dash with wrong icon, name and menu
+ 775864 getting-started: typo tie->the
+ 776225 [wayland] dropdown placed somewhere in the screen
+ 777363 wayland: avoid an unnecessary g_list_length call
+ 777547 Notebook arrow icon wrong color after closing final tab
+ 778009 menu drawn on top of menubar in Fedora
+
+* Translation updates:
+ Finnish
+ Galician
+ German
+ Icelandic
+ Kazakh
+ Polish
+ Simplified Chinese
+ Slovak
+ Spanish
+
+
 Overview of Changes in GTK+ 3.89.3
 ==================================

@@ -9,8 +9,8 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [89])
-m4_define([gtk_micro_version], [3])
+m4_define([gtk_minor_version], [90])
+m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
@@ -42,8 +42,8 @@ m4_define([gtk_binary_version], [4.0.0])

 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [49])
-m4_define([glib_required_micro], [4])
+m4_define([glib_required_minor], [53])
+m4_define([glib_required_micro], [0])
 m4_define([glib_required_version],
          [glib_required_major.glib_required_minor.glib_required_micro])
 m4_define([glib_min_required_minor],
@@ -1868,6 +1868,14 @@ case "$host" in
 esac
 AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)

+##################################################
+# Theming
+##################################################
+
+AC_PATH_PROG([SASSC], [sassc])
+AC_ARG_VAR(SASSC)
+AM_CONDITIONAL([REBUILD_SCSS], [test "x${SASSC}" != x])
+
 ##################################################
 # Output commands
 ##################################################
@@ -1969,6 +1977,12 @@ if test "x${enable_Bsymbolic}" = "xyes" ; then
 fi
 AC_SUBST(GTK_LINK_FLAGS)

+dnl
+dnl Check whether MSVC toolset is explicitly set
+dnl
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
 AC_CONFIG_FILES([
 README
 INSTALL
@@ -2025,6 +2039,7 @@ win32/Makefile
 win32/vs12/Makefile
 win32/vs12/gtk4-version-paths.props
 win32/vs14/Makefile
+win32/vs15/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
@@ -48,7 +48,7 @@
        </child>
        <child>
          <object class="GtkInfoBar" id="infobar">
-            <property name="no-show-all">1</property>
+            <property name="visible">0</property>
            <property name="hexpand">1</property>
            <child internal-child="content_area">
              <object class="GtkBox" id="content_area">
@@ -96,16 +96,15 @@ create_page1 (GtkWidget *assistant)
  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label);

  entry = gtk_entry_new ();
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);

-  gtk_widget_show_all (box);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
@@ -120,9 +119,8 @@ create_page2 (GtkWidget *assistant)

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                 "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), checkbutton);

-  gtk_widget_show_all (box);
  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
@@ -116,7 +116,7 @@ do_builder (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -70,68 +70,56 @@ do_button_box (GtkWidget *do_widget)
    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
    gtk_widget_set_margin_top (frame_horz, 10);
    gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz);

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
    g_object_set (vbox, "margin", 10, NULL);
    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD));

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE));

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START));

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END));

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER));

    gtk_box_pack_start (GTK_BOX (vbox),
-                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND));

    frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert);

    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
    g_object_set (hbox, "margin", 10, NULL);
    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD));

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE));

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START));

    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END));
    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER));
    gtk_box_pack_start (GTK_BOX (hbox),
-                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -123,7 +123,7 @@ query_for_toplevel (GdkScreen  *screen,
  g_object_set (label, "margin", 10, NULL);
  gtk_container_add (GTK_CONTAINER (frame), label);

-  gtk_widget_show_all (popup);
+  gtk_widget_show (popup);
  cursor = gdk_cursor_new_from_name (display, "crosshair");
  device = gtk_get_current_event_device ();

@@ -224,7 +224,6 @@ open_display_cb (GtkWidget         *button,
  gtk_container_add (GTK_CONTAINER (content_area), display_entry);

  gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));

  while (!result)
    {
@@ -313,7 +312,7 @@ create_frame (ChangeDisplayInfo *info,
                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
                                       GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), scrollwin);

  *tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -323,7 +322,7 @@ create_frame (ChangeDisplayInfo *info,
  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);

  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox);

  if (!info->size_group)
    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -363,11 +362,11 @@ create_display_frame (ChangeDisplayInfo *info)

  button = left_align_button_new ("_Open...");
  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);

  button = left_align_button_new ("_Close");
  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);

  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
                                                            G_TYPE_STRING,
@@ -540,14 +539,14 @@ do_changedisplay (GtkWidget *do_widget)

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      g_object_set (vbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox);

      frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      initialize_displays (info);

-      gtk_widget_show_all (info->window);
+      gtk_widget_show (info->window);
      return info->window;
    }
  else
@@ -225,45 +225,45 @@ do_clipboard (GtkWidget *do_widget)

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");

-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the first entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (copy_button_clicked), entry);

      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the second entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);

      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the first image */
      image = gtk_image_new_from_icon_name ("dialog-warning",
@@ -323,7 +323,7 @@ do_clipboard (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -53,7 +53,7 @@ change_color_callback (GtkWidget *button,
  g_signal_connect (dialog, "response",
                    G_CALLBACK (response_cb), NULL);

-  gtk_widget_show_all (dialog);
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -87,7 +87,7 @@ do_colorsel (GtkWidget *do_widget)

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
@@ -100,14 +100,14 @@ do_colorsel (GtkWidget *do_widget)
      gtk_widget_set_halign (button, GTK_ALIGN_END);
      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);

-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);

      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_color_callback), NULL);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget)
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget)
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)

    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget)

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -433,7 +433,7 @@ do_combobox (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -61,7 +61,7 @@ do_css_accordion (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -110,7 +110,7 @@ do_css_basics (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -138,7 +138,7 @@ do_css_blendmodes (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -157,7 +157,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -116,7 +116,7 @@ do_css_pixbufs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -138,7 +138,7 @@ do_css_shadows (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -27,13 +27,13 @@ add_section (GtkWidget   *box,
  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
  gtk_widget_set_margin_top (label, 10);
  gtk_widget_set_margin_bottom (label, 10);
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label);
  section = gtk_flow_box_new ();
  gtk_widget_set_halign (section, GTK_ALIGN_START);
  gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE);
  gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2);
  gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20);
-  gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), section);

  return section;
 }
@@ -152,7 +152,7 @@ do_cursors (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -159,9 +159,6 @@
              </object>
            </child>
          </object>
-          <packing>
-            <property name="expand">0</property>
-          </packing>
        </child>
        <child>
          <object class="GtkToolbar" id="toolbar1">
@@ -227,7 +224,6 @@
            </child>
          </object>
          <packing>
-            <property name="expand">0</property>
            <property name="position">1</property>
          </packing>
        </child>
@@ -235,6 +231,7 @@
          <object class="GtkScrolledWindow" id="scrolledwindow1">
            <property name="shadow_type">in</property>
            <property name="visible">1</property>
+            <property name="expand">1</property>
            <child>
              <object class="GtkTreeView" id="treeview1">
                <property name="visible">1</property>
@@ -286,7 +283,6 @@
          </object>
          <packing>
            <property name="position">2</property>
-            <property name="expand">1</property>
          </packing>
        </child>
        <child>
@@ -295,7 +291,6 @@
          </object>
          <packing>
            <property name="position">3</property>
-            <property name="expand">0</property>
          </packing>
        </child>
      </object>
@@ -56,15 +56,15 @@ interactive_dialog_clicked (GtkButton *button,
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox);

  image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), image);

  table = gtk_grid_new ();
  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
@@ -80,7 +80,6 @@ interactive_dialog_clicked (GtkButton *button,
  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);

-  gtk_widget_show_all (hbox);
  response = gtk_dialog_run (GTK_DIALOG (dialog));

  if (response == GTK_RESPONSE_OK)
@@ -123,30 +122,29 @@ do_dialog (GtkWidget *do_widget)

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

-      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                          FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

      /* Interactive dialog*/
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2);
+      gtk_box_pack_start (GTK_BOX (vbox2), button);

      table = gtk_grid_new ();
      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), table);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -163,7 +161,7 @@ do_dialog (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -221,11 +221,11 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -240,11 +240,11 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -277,7 +277,7 @@ do_drawingarea (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-      gtk_widget_show_all (window);
+      gtk_widget_show (window);
  else
      gtk_widget_destroy (window);

@@ -357,8 +357,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Shopping list (you can edit the cells!)"),
-                          FALSE, FALSE);
+                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -366,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* create models */
      items_model = create_items_model ();
@@ -387,23 +386,23 @@ do_editable_cells (GtkWidget *do_widget)
      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (add_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

      button = gtk_button_new_with_label ("Remove item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (remove_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -34,25 +34,25 @@ do_entry_buffer (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Entries share a buffer. Typing in one is reflected in the other.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      /* Create a buffer */
      buffer = gtk_entry_buffer_new (NULL, 0);

      /* Create our first entry */
      entry = gtk_entry_new_with_buffer (buffer);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      /* Create the second entry */
      entry = gtk_entry_new_with_buffer (buffer);
      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      g_object_unref (buffer);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
@@ -83,7 +83,7 @@ do_entry_completion (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -654,7 +654,7 @@ do_event_axes (GtkWidget *toplevel)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -25,19 +25,11 @@ expander_cb (GtkExpander *expander, GParamSpec *pspec, GtkWindow *dialog)
  gtk_window_set_resizable (dialog, gtk_expander_get_expanded (expander));
 }

-static void
-do_not_expand (GtkWidget *child, gpointer data)
-{
-  gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (child)), child,
-                           "expand", FALSE, "fill", FALSE, NULL);
-}
-
 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
  GtkWidget *toplevel;
  GtkWidget *area;
-  GtkWidget *box;
  GtkWidget *expander;
  GtkWidget *sw;
  GtkWidget *tv;
@@ -57,10 +49,6 @@ do_expander (GtkWidget *do_widget)
                                                "but not the full story.");

      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
-      box = gtk_widget_get_parent (area);
-      gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (box)), box,
-                               "expand", TRUE, "fill", TRUE, NULL);
-      gtk_container_foreach (GTK_CONTAINER (area), do_not_expand, NULL);

      expander = gtk_expander_new ("Details:");
      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -85,8 +73,7 @@ do_expander (GtkWidget *do_widget)
                                "resize the window. Do it already !", -1);
      gtk_container_add (GTK_CONTAINER (sw), tv);
      gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE);
-      gtk_widget_show_all (expander);
+      gtk_box_pack_end (GTK_BOX (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

@@ -94,7 +81,7 @@ do_expander (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -198,7 +198,7 @@ do_filtermodel (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -38,7 +38,6 @@ color_swatch_new (const gchar *color)
  gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
  gtk_container_add (GTK_CONTAINER (button), area);
-  gtk_widget_show_all (button);

  return button;
 }
@@ -741,8 +740,6 @@ do_flowbox (GtkWidget *do_widget)

      for (i = 0; colors[i]; i++)
        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
-
-      gtk_widget_show_all (scrolled);
    }

  if (!gtk_widget_get_visible (window))
@@ -977,7 +977,7 @@ do_foreigndrawing (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -13,6 +13,17 @@ static gdouble swipe_x = 0;
 static gdouble swipe_y = 0;
 static gboolean long_pressed = FALSE;

+static gboolean
+touchpad_swipe_gesture_begin (GtkGesture       *gesture,
+                              GdkEventSequence *sequence,
+                              GtkWidget        *widget)
+{
+  /* Disallow touchscreen events here */
+  if (sequence != NULL)
+    gtk_gesture_set_state (gesture, GTK_EVENT_SEQUENCE_DENIED);
+  return sequence == NULL;
+}
+
 static void
 swipe_gesture_swept (GtkGestureSwipe *gesture,
                     gdouble          velocity_x,
@@ -156,6 +167,19 @@ do_gestures (GtkWidget *do_widget)
                                                  GTK_PHASE_BUBBLE);
      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);

+      /* 3fg swipe for touchpads */
+      gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
+                              "widget", drawing_area,
+                              "n-points", 3,
+                              NULL);
+      g_signal_connect (gesture, "begin",
+                        G_CALLBACK (touchpad_swipe_gesture_begin), drawing_area);
+      g_signal_connect (gesture, "swipe",
+                        G_CALLBACK (swipe_gesture_swept), drawing_area);
+      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
+                                                  GTK_PHASE_BUBBLE);
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
+
      /* Long press */
      gesture = gtk_gesture_long_press_new (drawing_area);
      g_signal_connect (gesture, "pressed",
@@ -184,7 +208,7 @@ do_gestures (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

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

  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_show_all (demo_window);
+    gtk_widget_show (demo_window);
  else
    gtk_widget_destroy (demo_window);

@@ -200,7 +200,6 @@ gtk_fishbowl_remove (GtkContainer *container,

 static void
 gtk_fishbowl_forall (GtkContainer *container,
-                     gboolean      include_internals,
                     GtkCallback   callback,
                     gpointer      callback_data)
 {
@@ -209,9 +208,6 @@ gtk_fishbowl_forall (GtkContainer *container,
  GtkFishbowlChild *child;
  GList *children;

-  if (!include_internals)
-    return;
-
  children = priv->children;
  while (children)
    {
@@ -58,7 +58,7 @@ do_headerbar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -289,8 +289,6 @@ do_hypertext (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (sw), view);

      show_page (buffer, 1);
-
-      gtk_widget_show_all (sw);
    }

  if (!gtk_widget_get_visible (window))
@@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      tool_bar = gtk_toolbar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), tool_bar);

      up_button = gtk_tool_button_new (NULL, NULL);
      gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
@@ -290,8 +290,9 @@ do_iconview (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
+      gtk_widget_set_vexpand (sw, TRUE);

-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
@@ -326,7 +327,7 @@ do_iconview (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -150,7 +150,7 @@ do_iconview_edit (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);

@@ -372,13 +372,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      image = gtk_image_new_from_resource ("/images/floppybuddy.gif");

@@ -389,13 +389,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
@@ -408,13 +408,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -426,7 +426,7 @@ do_images (GtkWidget *do_widget)

      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
@@ -434,7 +434,7 @@ do_images (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -34,7 +34,7 @@ on_bar_response (GtkInfoBar *info_bar,
                            G_CALLBACK (gtk_widget_destroy),
                            dialog);

-  gtk_widget_show_all (dialog);
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (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_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Message");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (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_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Warning");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget)
      bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
      gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (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_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Question");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (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_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Error");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (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_line_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Other");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget)
      frame = gtk_frame_new ("Info bars");
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      g_object_set (vbox2, "margin", 8, NULL);
@@ -138,14 +138,13 @@ do_infobar (GtkWidget *do_widget)

      /* Standard message dialog */
      label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label);

-      gtk_widget_show_all (actions);
-      gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), actions);
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -1,7 +1,7 @@
 /* Links
 *
 * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri() on their URI, but it is possible to override
+ * gtk_show_uri_on_window() on their URI, but it is possible to override
 * this with a custom handler.
 */

@@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* create tree model */
      model = create_model ();
@@ -301,7 +301,7 @@ do_list_store (GtkWidget *do_widget)

  if (!gtk_widget_get_visible (window))
    {
-      gtk_widget_show_all (window);
+      gtk_widget_show (window);
      if (timeout == 0) {
        /* FIXME this should use the animation-duration instead */
        timeout = g_timeout_add (80, spinner_timeout, NULL);
@@ -359,10 +359,11 @@ do_listbox (GtkWidget *do_widget)
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_container_add (GTK_CONTAINER (window), vbox);
      label = gtk_label_new ("Messages from Gtk+ and friends");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE);
+      gtk_widget_set_vexpand (scrolled, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
      listbox = gtk_list_box_new ();
      gtk_container_add (GTK_CONTAINER (scrolled), listbox);

@@ -370,8 +371,6 @@ do_listbox (GtkWidget *do_widget)
      gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);
      g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), NULL);

-      gtk_widget_show_all (vbox);
-
      data = g_resources_lookup_data ("/listbox/messages.txt", 0, NULL);
      lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);

@@ -90,7 +90,6 @@
                </style>
              </object>
              <packing>
-                <property name="fill">0</property>
                <property name="pack_type">end</property>
                <property name="position">2</property>
              </packing>
@@ -592,7 +592,6 @@ add_data_tab (const gchar *demoname)
          g_bytes_unref (bytes);
        }

-      gtk_widget_show_all (widget);
      label = gtk_label_new (resources[i]);
      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
@@ -1022,8 +1021,6 @@ activate (GApplication *app)
  g_signal_connect (item, "activate", G_CALLBACK (end_cb), scrollbar);
  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

-  gtk_widget_show_all (menu);
-
  g_signal_connect (scrollbar, "popup-menu", G_CALLBACK (scrollbar_popup), menu);

  load_file (gtk_demos[0].name, gtk_demos[0].filename);
@@ -1040,7 +1037,7 @@ activate (GApplication *app)

  gtk_tree_view_collapse_all (GTK_TREE_VIEW (treeview));

-  gtk_widget_show_all (GTK_WIDGET (window));
+  gtk_widget_show (GTK_WIDGET (window));

  g_object_unref (builder);
 }
@@ -97,6 +97,7 @@
            <property name="scrollable">1</property>
            <property name="enable_popup">1</property>
            <property name="show_border">0</property>
+            <property name="expand">1</property>
            <child>
              <object class="GtkScrolledWindow">
                <property name="visible">1</property>
@@ -166,7 +167,6 @@
            </child>
          </object>
          <packing>
-            <property name="expand">1</property>
            <property name="position">1</property>
          </packing>
        </child>
@@ -70,7 +70,6 @@ do_markup (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
-      gtk_widget_show_all (header);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);

      gtk_window_set_title (GTK_WINDOW (window), "Markup");
@@ -86,7 +85,6 @@ do_markup (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_container_add (GTK_CONTAINER (sw), view);
-      gtk_widget_show_all (sw);

      gtk_stack_add_named (GTK_STACK (stack), sw, "formatted");

@@ -100,7 +98,6 @@ do_markup (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_container_add (GTK_CONTAINER (sw), view2);
-      gtk_widget_show_all (sw);

      gtk_stack_add_named (GTK_STACK (stack), sw, "source");

@@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget)

      menubar = gtk_menu_bar_new ();
      gtk_widget_set_hexpand (menubar, TRUE);
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), menubar);
      gtk_widget_show (menubar);

      menu = create_menu (2);
@@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget)
      gtk_widget_show (menuitem);

      box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2);
      gtk_widget_show (box2);

      button = gtk_button_new_with_label ("Flip");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_orientation), menubar);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button);
      gtk_widget_show (button);

      button = gtk_button_new_with_label ("Close");
      g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK(gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button);
      gtk_widget_set_can_default (button, TRUE);
      gtk_widget_grab_default (button);
      gtk_widget_show (button);
@@ -59,7 +59,7 @@ do_modelbutton (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -65,19 +65,17 @@ do_overlay (GtkWidget *do_widget)
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
      gtk_widget_set_margin_top (label, 8);
      gtk_widget_set_margin_bottom (label, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
      gtk_widget_set_margin_top (entry, 8);
      gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      gtk_container_add (GTK_CONTAINER (window), overlay);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      gtk_widget_show_all (overlay);
    }

  if (!gtk_widget_get_visible (window))
@@ -92,8 +92,6 @@ do_overlay2 (GtkWidget *do_widget)
      gtk_widget_set_tooltip_text (scale, "Margin");

      gtk_adjustment_set_value (adjustment, 100);
-
-      gtk_widget_show_all (overlay);
    }

  if (!gtk_widget_get_visible (window))
@@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget)

      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      g_object_set (vpaned, "margin", 5, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), vpaned);

      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -177,17 +177,13 @@ do_panes (GtkWidget *do_widget)
                          create_pane_options (GTK_PANED (hpaned),
                                               "Horizontal",
                                               "Left",
-                                               "Right"),
-                          FALSE, FALSE);
+                                               "Right"));

      gtk_box_pack_start (GTK_BOX (vbox),
                          create_pane_options (GTK_PANED (vpaned),
                                               "Vertical",
                                               "Top",
-                                               "Bottom"),
-                          FALSE, FALSE);
-
-      gtk_widget_show_all (vbox);
+                                               "Bottom"));
    }

  if (!gtk_widget_get_visible (window))
@@ -73,7 +73,7 @@ do_pickers (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -219,7 +219,7 @@ do_pixbufs (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    {
      gtk_widget_destroy (window);
@@ -167,7 +167,7 @@ do_popover (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -82,7 +82,7 @@ do_revealer (GtkWidget *do_widget)
    {
      count = 0;
      timeout = g_timeout_add (690, reveal_one, window);
-      gtk_widget_show_all (window);
+      gtk_widget_show (window);
    }
  else
    {
@@ -204,8 +204,6 @@ do_rotated_text (GtkWidget *do_widget)
      label = gtk_label_new (text);
      gtk_container_add (GTK_CONTAINER (box), label);

-      gtk_label_set_angle (GTK_LABEL (label), 45);
-
      /* Set up fancy stuff on the label */
      layout = gtk_label_get_layout (GTK_LABEL (label));
      pango_cairo_context_set_shape_renderer (pango_layout_get_context (layout),
@@ -217,7 +215,7 @@ do_rotated_text (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -29,7 +29,7 @@ do_scale (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -145,8 +145,6 @@ create_search_menu (GtkWidget *entry)
                    G_CALLBACK (search_by_file), entry);
  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

-  gtk_widget_show_all (menu);
-
  return menu;
 }

@@ -243,20 +241,20 @@ do_search_entry (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create our entry */
      entry = gtk_search_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);

      /* Create the find and cancel buttons */
      notebook = gtk_notebook_new ();
      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
      gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), notebook);

      find_button = gtk_button_new_with_label ("Find");
      g_signal_connect (find_button, "clicked",
@@ -290,7 +288,7 @@ do_search_entry (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    {
      gtk_widget_destroy (menu);
@@ -91,12 +91,12 @@ do_search_entry2 (GtkWidget *do_widget)
      entry = gtk_search_entry_new ();
      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (container), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (container), entry);
      searchbar = gtk_search_bar_new ();
      gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry));
      gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
      gtk_container_add (GTK_CONTAINER (searchbar), container);
-      gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), searchbar);

      /* Hook the search bar to key presses */
      g_signal_connect (window, "key-press-event",
@@ -104,26 +104,26 @@ do_search_entry2 (GtkWidget *do_widget)

      /* Help */
      label = gtk_label_new ("Start Typing to search");
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      /* Toggle button */
      button = gtk_toggle_button_new_with_label ("Search");
      g_object_bind_property (button, "active",
                              searchbar, "search-mode-enabled",
                              G_BINDING_BIDIRECTIONAL);
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button);

      /* Result */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      label = gtk_label_new ("Result:");
      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
      gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);

      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);

      g_signal_connect (entry, "search-changed",
                        G_CALLBACK (search_changed_cb), label);
@@ -131,15 +131,15 @@ do_search_entry2 (GtkWidget *do_widget)
                        G_CALLBACK (changed_cb), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      label = gtk_label_new ("Signal:");
      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
      gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);

      label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label);

      g_signal_connect (entry, "search-changed",
                        G_CALLBACK (search_changed), label);
@@ -152,7 +152,7 @@ do_search_entry2 (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

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

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget)

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      sidebar = gtk_stack_sidebar_new ();
-      gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), sidebar);

      stack = gtk_stack_new ();
      gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
@@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget)

      /* Separator between sidebar and stack */
      widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX(box), widget);

-      gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), stack);

      for (i=0; (c = *(pages+i)) != NULL; i++ )
        {
@@ -80,7 +80,7 @@ do_sidebar (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* Create one frame holding color options */
      frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      table = gtk_grid_new ();
      g_object_set (table, "margin", 5, NULL);
@@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* And another frame holding line style options */
      frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      table = gtk_grid_new ();
      g_object_set (table, "margin", 5, NULL);
@@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget)

      /* And a check button to turn grouping on and off */
      check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), check_button);

      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
      g_signal_connect (check_button, "toggled",
@@ -150,7 +150,7 @@ do_sizegroup (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -245,7 +245,7 @@ do_spinbutton (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget)

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
    g_object_set (vbox, "margin", 5, NULL);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox);

    /* Sensitive */
    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
@@ -88,7 +88,7 @@ do_spinner (GtkWidget *do_widget)
  }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -29,7 +29,7 @@ do_stack (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -48,8 +48,6 @@ do_tabs (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC);
      gtk_container_add (GTK_CONTAINER (window), sw);
      gtk_container_add (GTK_CONTAINER (sw), view);
-
-      gtk_widget_show_all (sw);
    }

  if (!gtk_widget_get_visible (window))
@@ -74,7 +74,7 @@ do_textmask (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
  guint timeout;

  swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow);
  textview = gtk_text_view_new ();
  gtk_container_add (GTK_CONTAINER (swindow), textview);

@@ -195,7 +195,7 @@ do_textscroll (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -452,8 +452,6 @@ attach_widgets (GtkTextView *text_view)
                                         widget,
                                         anchor);

-      gtk_widget_show_all (widget);
-
      ++i;
    }
 }
@@ -515,8 +513,6 @@ do_textview (GtkWidget *do_widget)

      attach_widgets (GTK_TEXT_VIEW (view1));
      attach_widgets (GTK_TEXT_VIEW (view2));
-
-      gtk_widget_show_all (vpaned);
    }

  if (!gtk_widget_get_visible (window))
@@ -601,5 +597,5 @@ easter_egg_callback (GtkWidget *button,

  gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);

-  gtk_widget_show_all (window);
+  gtk_widget_show (window);
 }
@@ -31,7 +31,6 @@ do_theming_style_classes (GtkWidget *do_widget)
      builder = gtk_builder_new_from_resource ("/theming_style_classes/theming.ui");

      grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
-      gtk_widget_show_all (grid);
      gtk_container_add (GTK_CONTAINER (window), grid);
      g_object_unref (builder);
    }
@@ -124,13 +124,11 @@ palette_drop_item (GtkToolItem      *drag_item,

  if (GTK_TOOL_ITEM_GROUP (drag_group) != drop_group)
    {
-      gboolean homogeneous, expand, fill, new_row;
+      gboolean homogeneous, new_row;

      g_object_ref (drag_item);
      gtk_container_child_get (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item),
                               "homogeneous", &homogeneous,
-                               "expand", &expand,
-                               "fill", &fill,
                               "new-row", &new_row,
                               NULL);
      gtk_container_remove (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item));
@@ -138,8 +136,6 @@ palette_drop_item (GtkToolItem      *drag_item,
                                  drag_item, drop_position);
      gtk_container_child_set (GTK_CONTAINER (drop_group), GTK_WIDGET (drag_item),
                               "homogeneous", homogeneous,
-                               "expand", expand,
-                               "fill", fill,
                               "new-row", new_row,
                               NULL);
      g_object_unref (drag_item);
@@ -473,7 +469,7 @@ do_toolpalette (GtkWidget *do_widget)
                                      "text", 0,
                                      NULL);
      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_orientation);

      /* Style combo box: */
      style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
@@ -512,11 +508,11 @@ do_toolpalette (GtkWidget *do_widget)
                                      "text", 0,
                                      NULL);
      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_style);

      /* Add hbox */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), hbox);

      /* Add and fill the ToolPalette: */
      palette = gtk_tool_palette_new ();
@@ -526,6 +522,7 @@ do_toolpalette (GtkWidget *do_widget)
      load_special_items (GTK_TOOL_PALETTE (palette));

      palette_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_widget_set_vexpand (palette_scroller, TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
@@ -535,8 +532,6 @@ do_toolpalette (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
      gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);

-      gtk_widget_show_all (box);
-
      /* Connect signals: */
      g_signal_connect (combo_orientation, "changed",
                        G_CALLBACK (on_combo_orientation_changed), palette);
@@ -550,7 +545,7 @@ do_toolpalette (GtkWidget *do_widget)

      notebook = gtk_notebook_new ();
      g_object_set (notebook, "margin", 6, NULL);
-      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX(hbox), notebook);

      /* ===== DnD for tool items ===== */

@@ -620,7 +615,7 @@ do_toolpalette (GtkWidget *do_widget)

  if (!gtk_widget_get_visible (window))
    {
-      gtk_widget_show_all (window);
+      gtk_widget_show (window);
    }
  else
    {
@@ -752,19 +747,19 @@ load_special_items (GtkToolPalette *palette)
  item = create_entry_item ("homogeneous=FALSE, expand=TRUE");
  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
+                           "homogeneous", FALSE,
                           NULL);

  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, fill=FALSE");
  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           "fill", FALSE, NULL);
+                           "homogeneous", FALSE,
+                           NULL);

  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, new-row=TRUE");
  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
+                           "homogeneous", FALSE,
                           "new-row", TRUE, NULL);

  item = gtk_tool_button_new (NULL, NULL);
@@ -783,7 +778,7 @@ load_special_items (GtkToolPalette *palette)
  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "edit-delete");
  gtk_tool_item_set_tooltip_text (item, "Do not show at all");
  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_widget_set_no_show_all (GTK_WIDGET (item), TRUE);
+  gtk_widget_hide (GTK_WIDGET (item));

  item = gtk_tool_button_new (NULL, NULL);
  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "view-fullscreen");
@@ -229,7 +229,7 @@ do_transparent (GtkWidget *do_widget)
      gtk_widget_set_halign (entry, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (entry, GTK_ALIGN_START);

-      gtk_widget_show_all (overlay);
+      gtk_widget_show (overlay);
    }

  if (!gtk_widget_get_visible (window))
@@ -402,8 +402,7 @@ do_tree_store (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_box_pack_start (GTK_BOX (vbox),
-                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-                          FALSE, FALSE);
+                          gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -411,7 +410,7 @@ do_tree_store (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* create model */
      model = create_model ();
@@ -433,7 +432,7 @@ do_tree_store (GtkWidget *do_widget)
    }

  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
+    gtk_widget_show (window);
  else
    gtk_widget_destroy (window);

@@ -232,7 +232,7 @@ activate_about (GSimpleAction *action,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK+ themes and widgets",
                         "authors", authors,
-                         "logo-icon-name", "gtk3-widget-factory",
+                         "logo-icon-name", "gtk4-widget-factory",
                         "title", "About GTK+ Widget Factory",
                         "system-information", s->str,
                         NULL);
@@ -800,10 +800,11 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                "use-markup", TRUE,
                "halign", GTK_ALIGN_START,
                "valign", GTK_ALIGN_CENTER,
+                "hexpand", TRUE,
                "margin", 6,
                "xalign", 0.0,
                NULL);
-  gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (row), label);
  gdk_rgba_parse (&rgba, color);
  swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                         "rgba", &rgba,
@@ -815,8 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                         NULL);
  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
-  gtk_widget_show_all (row);
+  gtk_box_pack_start (GTK_BOX (row), box);
  gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
  row = gtk_widget_get_parent (row);
  gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -912,9 +912,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                    "halign", GTK_ALIGN_START,
                    "valign", GTK_ALIGN_CENTER,
                    "margin", 6,
+                    "hexpand", TRUE,
                    "xalign", 0.0,
                    NULL);
-      gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (row), label);
      gdk_rgba_parse (&rgba, colors[i].color);
      swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                             "rgba", &rgba,
@@ -926,8 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                             NULL);
      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
-      gtk_widget_show_all (row);
+      gtk_box_pack_start (GTK_BOX (row), box);
      gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
      row = gtk_widget_get_parent (row);
      gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -1893,7 +1893,7 @@ activate (GApplication *app)
  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
  g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);

-  gtk_widget_show_all (GTK_WIDGET (window));
+  gtk_widget_show (GTK_WIDGET (window));

  g_object_unref (builder);
 }
@@ -1901,7 +1901,7 @@ activate (GApplication *app)
 static void
 print_version (void)
 {
-  g_print ("gtk3-widget-factory %d.%d.%d\n",
+  g_print ("gtk4-widget-factory %d.%d.%d\n",
           gtk_get_major_version (),
           gtk_get_minor_version (),
           gtk_get_micro_version ());
@@ -8,11 +8,11 @@
  <bookinfo>
    <title>GDK 4 Reference Manual</title>
    <releaseinfo>
-      This document is for the GDK 3 library, version &version;
+      This document is for the GDK 4 library, version &version;.
      The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gdk3/</ulink>.
-      If you are looking for the older GDK 2 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gdk2/">http://developer.gnome.org/gdk2/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gdk4/">https://developer.gnome.org/gdk4/</ulink>.
+      If you are looking for the older GDK 3 series of libraries,
+      see <ulink role="online-location" url="https://developer.gnome.org/gdk3/">https://developer.gnome.org/gdk3/</ulink>.
    </releaseinfo>
  </bookinfo>

@@ -10,7 +10,7 @@
    <releaseinfo>
      This document is for the GSK 4 library, version &version;
      The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gsk4/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gsk4/">https://developer.gnome.org/gsk4/</ulink>.
    </releaseinfo>
  </bookinfo>

@@ -140,7 +140,7 @@ How to compile GTK+ itself
      <listitem>
        <para>
          <ulink
-          url="http://pkg-config.freedesktop.org">pkg-config</ulink>
+          url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
          is a tool for tracking the compilation flags needed for
          libraries that are used by the GTK+ libraries. (For each
          library, a small <literal>.pc</literal> text file is installed
@@ -153,7 +153,7 @@ How to compile GTK+ itself
          The GTK+ makefiles will mostly work with different versions
          of <command>make</command>, however, there tends to be
          a few incompatibilities, so the GTK+ team recommends
-          installing <ulink url="http://www.gnu.org/software/make">GNU
+          installing <ulink url="https://www.gnu.org/software/make">GNU
            make</ulink> if you don't already have it on your system
          and using it. (It may be called <command>gmake</command>
          rather than <command>make</command>.)
@@ -171,24 +171,24 @@ How to compile GTK+ itself
          The GLib library provides core non-graphical functionality
          such as high level data types, Unicode manipulation, and
          an object and type system to C programs. It is available
-          from the <ulink url="http://ftp.gtk.org/pub/glib/">GTK+
+          from the <ulink url="https://ftp.gtk.org/pub/glib/">GTK+
          FTP site</ulink> or
-          <ulink url="http://download.gnome.org/sources/glib/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/glib/">here</ulink>.
        </para>
      </listitem>
      <listitem>
        <para>
-          The <ulink url="http://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
+          The <ulink url="https://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
          provides facilities for loading images in a variety of file formats.
          It is available
-          <ulink url="http://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
        </para>
      </listitem>
      <listitem>
        <para>
          <ulink url="http://www.pango.org">Pango</ulink> is a library
          for internationalized text handling. It is available
-          <ulink url="http://download.gnome.org/sources/pango/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/pango/">here</ulink>.
        </para>
      </listitem>
      <listitem>
@@ -197,7 +197,7 @@ How to compile GTK+ itself
          interfaces allowing accessibility technologies such as
          screen readers to interact with a graphical user interface.
          It is available
-          <ulink url="http://download.gnome.org/sources/atk/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/atk/">here</ulink>.
        </para>
      </listitem>
      <listitem>
@@ -205,7 +205,7 @@ How to compile GTK+ itself
          <ulink url="https://wiki.gnome.org/Projects/GObjectIntrospection">Gobject Introspection</ulink>
          is a framework for making introspection data available to
          language bindings. It is available
-          <ulink url="http://download.gnome.org/sources/gobject-introspection/">here</ulink>.
+          <ulink url="https://download.gnome.org/sources/gobject-introspection/">here</ulink>.
        </para>
      </listitem>
    </itemizedlist>
@@ -213,7 +213,7 @@ How to compile GTK+ itself
      <title>External dependencies</title>
      <listitem>
        <para>
-          The <ulink url="http://www.gnu.org/software/libiconv/">GNU
+          The <ulink url="https://www.gnu.org/software/libiconv/">GNU
          libiconv library</ulink> is needed to build GLib if your
          system doesn't have the <function>iconv()</function>
          function for doing conversion between character
@@ -224,7 +224,7 @@ How to compile GTK+ itself
      <listitem>
        <para>
          The libintl library from the <ulink
-          url="http://www.gnu.org/software/gettext/">GNU gettext
+          url="https://www.gnu.org/software/gettext/">GNU gettext
          package</ulink> is needed if your system doesn't have the
          <function>gettext()</function> functionality for handling
          message translation databases.
@@ -241,14 +241,14 @@ How to compile GTK+ itself
      </listitem>
      <listitem>
        <para>
-          The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
+          The <ulink url="https://www.freedesktop.org/wiki/Software/fontconfig/">fontconfig</ulink>
          library provides Pango with a standard way of locating
          fonts and matching them against font names.
        </para>
      </listitem>
      <listitem>
        <para>
-          <ulink url="http://www.cairographics.org">Cairo</ulink>
+          <ulink url="https://www.cairographics.org">Cairo</ulink>
          is a graphics library that supports vector graphics and image
          compositing. Both Pango and GTK+ use cairo for all of their
          drawing.
@@ -263,13 +263,13 @@ How to compile GTK+ itself
      </listitem>
      <listitem>
        <para>
-          The <ulink url="http://wayland.freedesktop.org">Wayland</ulink> libraries
+          The <ulink url="https://wayland.freedesktop.org">Wayland</ulink> libraries
          are needed to build GTK+ with the Wayland backend.
        </para>
      </listitem>
      <listitem>
        <para>
-          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
+          The <ulink url="https://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
          package is not a hard dependency of GTK+, but it contains definitions
          for mime types that are used by GIO and, indirectly, by GTK+.
          gdk-pixbuf will use GIO for mime type detection if possible. For this
@@ -46,7 +46,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>

  <para>
    We loosely follow the CSS
-    <ulink url="http://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
+    <ulink url="https://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
    specification in the formatting of syntax productions.
    <simplelist>
      <member>Nonterminals are enclosed in angle backets (〈〉), all other strings that are not listed here are literals</member>
@@ -154,7 +154,7 @@ button, entry {

    <para>
      To learn more about the @import rule, you can read the
-      <ulink url="http://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
+      <ulink url="https://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
      module of the CSS specification.
    </para>

@@ -360,85 +360,85 @@ checkbutton:indeterminate {
          <row>
            <entry>*</entry>
            <entry>any node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E</entry>
            <entry>any node with name E</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E.class</entry>
            <entry>any E node with the given style class</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E#id</entry>
            <entry>any E node with the given ID</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
            <entry>GTK+ uses the widget name as ID</entry>
          </row>
          <row>
            <entry>E:nth‑child(〈nth‑child〉)</entry>
            <entry>any E node which is the n-th child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E:nth‑last‑child(〈nth‑child〉)</entry>
            <entry>any E node which is the n-th child of its parent node, counting from the end</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E:first‑child</entry>
            <entry>any E node which is the first child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E:last‑child</entry>
            <entry>any E node which is the last child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E:only‑child</entry>
            <entry>any E node which is the only child of its parent node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry>Equivalent to E:first-child:last-child</entry>
          </row>
          <row>
            <entry>E:link, E:visited</entry>
            <entry>any E node which represents a hyperlink, not yet visited (:link) or already visited (:visited)</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_LINK and GTK_STATE_FLAGS_VISITED</entry>
          </row>
          <row>
            <entry>E:active, E:hover, E:focus</entry>
            <entry>any E node which is part of a widget with the corresponding state</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT and GTK_STATE_FLAGS_FOCUSED; GTK+ also allows E:prelight and E:focused</entry>
          </row>
          <row>
            <entry>E:disabled</entry>
            <entry>any E node which is part of a widget with is disabled</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_INSENSITIVE; GTK+ also allows E:insensitive</entry>
          </row>
          <row>
            <entry>E:checked</entry>
            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is checked</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_CHECKED</entry>
          </row>
          <row>
            <entry>E:indeterminate</entry>
            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is in an inconsistent state</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
                   <ulink url="https://drafts.csswg.org/selectors/#indeterminate">CSS4</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_INCONSISTENT; GTK+ also allows E:inconsistent</entry>
          </row>
@@ -451,7 +451,7 @@ checkbutton:indeterminate {
          <row>
            <entry>E:not(〈selector〉)</entry>
            <entry>any E node which does not match the simple selector 〈selector〉</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
@@ -469,25 +469,25 @@ checkbutton:indeterminate {
          <row>
            <entry>E F</entry>
            <entry>any F node which is a descendent of an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E > F</entry>
            <entry>any F node which is a child of an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E ~ F</entry>
            <entry>any F node which is preceded by an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
            <entry>E + F</entry>
            <entry>any F node which is immediately preceded by an E node</entry>
-            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
        </tbody>
@@ -499,7 +499,7 @@ checkbutton:indeterminate {

    <para>
      To learn more about selectors in CSS, read the
-      <ulink url="http://www.w3.org/TR/css3-selectors/">Selectors</ulink>
+      <ulink url="https://www.w3.org/TR/css3-selectors/">Selectors</ulink>
      module of the CSS specification.
    </para>

@@ -532,7 +532,7 @@ checkbutton:indeterminate {

    <para>
      For a list of valid color names and for more background on colors in
-      CSS, see the <ulink url="http://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
+      CSS, see the <ulink url="https://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
      module of the CSS specification.
    </para>

@@ -582,12 +582,21 @@ background-color: @bg_color;
    </example>

    <para>
-      GTK+ also allows to form color expressions, which can be nested and
-      provide a rich language to define colors which are derived from a
-      set of base colors.
+      GTK+ also supports color expressions, which allow colors to be transformed
+      to new ones and can be nested, providing a rich language to define colors.
+      Color expressions resemble functions, taking 1 or more colors and in some
+      cases a number as arguments.
+    </para>
+    <para>
+      shade() leaves the color unchanged when the number is 1 and transforms it
+      to black or white as the number approaches 0 or 2 respectively. For mix(),
+      0 or 1 return the unaltered 1st or 2nd color respectively; numbers between
+      0 and 1 return blends of the two; and numbers below 0 or above 1 intensify
+      the RGB components of the 1st or 2nd color respectively. alpha() takes a
+      number from 0 to 1 and applies that as the opacity of the supplied color.
    </para>

-<literallayout><code>〈color expression〉 = lighter(〈color〉) | darker(〈color〉) | shade(〈number〉,〈color〉) | alpha(〈number〉,〈color〉) | mix(〈number〉,〈color〉,〈color〉)</code>
+<literallayout><code>〈color expression〉 = lighter(〈color〉) | darker(〈color〉) | shade(〈color〉,〈number〉) | alpha(〈color〉,〈number〉) | mix(〈color〉,〈color〉,〈number〉)</code>
 </literallayout>

    <para>
@@ -645,7 +654,7 @@ button {
    <para>
      A crossfade lets you specify an image as an intermediate between two
      images. Crossfades are specified in the draft of the level 4
-      <ulink url="http://www.w3.org/TR/css4-images">Image</ulink>
+      <ulink url="https://www.w3.org/TR/css4-images">Image</ulink>
      module of the CSS specification.
    </para>

@@ -725,7 +734,7 @@ label {
      To learn more about gradients in CSS, including details of how color stops
      are placed on the gradient line and keywords for specifying radial sizes,
      you can read the
-      <ulink url="http://www.w3.org/TR/css3-images/#gradients">Image</ulink>
+      <ulink url="https://www.w3.org/TR/css3-images/#gradients">Image</ulink>
      module of the CSS specification.
    </para>

@@ -94,7 +94,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
      The calc() notation adds considerable expressive power. There are limits
      on what types can be combined in such an expression (e.g. it does not make
      sense to add a number and a time). For the full details, see the
-      <ulink url="http://www.w3.org/TR/css3-values/#calc-notation">CSS3 Values and
+      <ulink url="https://www.w3.org/TR/css3-values/#calc-notation">CSS3 Values and
      Units</ulink> spec.
    </para>

@@ -108,7 +108,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
          <term>4 values: </term><listitem>top right bottom left</listitem>
        </varlistentry>
        <varlistentry>
-          <term>3 values: </term><listitem>top horizontal left</listitem>
+          <term>3 values: </term><listitem>top horizontal bottom</listitem>
        </varlistentry>
        <varlistentry>
          <term>2 values: </term><listitem>vertical horizontal</listitem>
@@ -134,8 +134,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>rgba(1,1,1,1)</code></entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-color">CSS2</ulink>,
-                    <ulink url="http://www.w3.org/TR/css3-color/#foreground">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-color">CSS2</ulink>,
+                    <ulink url="https://www.w3.org/TR/css3-color/#foreground">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -144,7 +144,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>1</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-color/#opacity">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-color/#opacity">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -193,8 +193,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>gtk-font-name setting</entry>
              <entry>✓</entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-family">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-family-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-family">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-family-prop">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -203,8 +203,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>gtk-font-name setting</entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-size-props">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-size-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-size-props">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-size-prop">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -213,8 +213,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>normal</code></entry>
              <entry>✓</entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-style-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-style-prop">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -223,8 +223,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>normal</code></entry>
              <entry>✓</entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-variant">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#descdef-font-variant">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-variant">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#descdef-font-variant">CSS3</ulink></entry>
              <entry>only CSS2 values supported</entry>
            </row>
            <row>
@@ -233,8 +233,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>normal</code></entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-fonts/#font-weight-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-fonts/#font-weight-prop">CSS3</ulink></entry>
              <entry>normal is synonymous with 400, bold with 700</entry>
            </row>
            <row>
@@ -243,7 +243,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>normal</code></entry>
              <entry>✓</entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-fonts/#font-stretch-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-fonts/#font-stretch-prop">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -266,8 +266,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>font</entry>
              <entry><code>[ 〈font-style〉 || 〈font-variant〉 || 〈font-weight〉 || 〈font-stretch〉 ]? 〈font-size〉 〈font-family〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-shorthand">CSS2</ulink>,
-<ulink url="http://www.w3.org/TR/css3-fonts/#font-prop">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#font-shorthand">CSS2</ulink>,
+<ulink url="https://www.w3.org/TR/css3-fonts/#font-prop">CSS3</ulink></entry>
              <entry>CSS allows line-height, etc</entry>
            </row>
          </tbody>
@@ -299,7 +299,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-ui/#caret-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-ui/#caret-color">CSS3</ulink></entry>
              <entry>CSS allows an auto value</entry>
            </row>
            <row>
@@ -335,7 +335,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-text/#letter-spacing">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-text/#letter-spacing">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -344,8 +344,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/text.html#propdef-text-decoration">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/text.html#propdef-text-decoration">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property">CSS3</ulink></entry>
              <entry>CSS allows overline</entry>
            </row>
            <row>
@@ -354,7 +354,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -363,7 +363,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>solid</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property">CSS3</ulink></entry>
              <entry>CSS allows dashed and dotted</entry>
            </row>
            <row>
@@ -372,7 +372,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry>✓</entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-shadow-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-shadow-property">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -386,7 +386,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>text‑decoration</entry>
              <entry><code>〈text-decoration-line〉 || 〈text-decoration-style〉 || 〈text-decoration-color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css-text-decor-3/#text-decoration-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css-text-decor-3/#text-decoration-property">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -527,8 +527,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#min-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#min-width">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
            <row>
@@ -537,8 +537,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-height">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#min-height">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/visudet.html#propdef-min-height">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#min-height">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
            <row>
@@ -547,8 +547,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-top">CSS3</ulink></entry>
              <entry>CSS allows percentages or auto</entry>
            </row>
            <row>
@@ -557,8 +557,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-right">CSS3</ulink></entry>
              <entry>CSS allows percentages or auto</entry>
            </row>
            <row>
@@ -567,8 +567,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-bottom">CSS3</ulink></entry>
              <entry>CSS allows percentages or auto</entry>
            </row>
            <row>
@@ -577,8 +577,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin-left">CSS3</ulink></entry>
              <entry>CSS allows percentages or auto</entry>
            </row>
            <row>
@@ -587,8 +587,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-top">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
            <row>
@@ -597,8 +597,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-right">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
            <row>
@@ -607,8 +607,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-bottom">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
            <row>
@@ -617,8 +617,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding-left">CSS3</ulink></entry>
              <entry>CSS allows percentages</entry>
            </row>
          </tbody>
@@ -632,16 +632,16 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>margin</entry>
              <entry><code>〈length〉{1,4}</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#margin">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-margin">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#margin">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
            <row>
              <entry>padding</entry>
              <entry><code>〈length〉{1,4}</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-box/#padding">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-padding">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-box/#padding">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
          </tbody>
@@ -663,8 +663,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
              <entry>CSS allows other values</entry>
            </row>
            <row>
@@ -673,8 +673,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/css3-background/#the-border-width">CSS3</ulink></entry>
              <entry>CSS allows other values</entry>
            </row>
            <row>
@@ -683,8 +683,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
              <entry>CSS allows other values</entry>
            </row>
            <row>
@@ -693,8 +693,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
              <entry>CSS allows other values</entry>
            </row>
            <row>
@@ -703,8 +703,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -713,8 +713,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -723,8 +723,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -733,8 +733,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -743,8 +743,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-right-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-right-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -753,8 +753,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-right-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-right-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -763,8 +763,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-left-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-left-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -773,8 +773,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-left-radius">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-left-radius">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-radius">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -783,8 +783,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -793,8 +793,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -803,8 +803,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -813,8 +813,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -823,7 +823,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#the-border-image-source">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#the-border-image-source">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -832,7 +832,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>stretch</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-repeat">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-repeat">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -841,7 +841,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>100%</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-slice">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-slice">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
            <row>
@@ -850,7 +850,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>1</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR//css3-background/#the-border-image-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR//css3-background/#the-border-image-width">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>

@@ -865,77 +865,77 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>border‑width</entry>
              <entry><code>〈length〉{1,4}</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-width">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
            <row>
              <entry>border‑style</entry>
              <entry><code>〈border style〉{1,4}</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#the-border-style">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
            <row>
              <entry>border‑color</entry>
              <entry><code>〈color〉{1,4}</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-color">CSS3</ulink></entry>
              <entry>a 'four sides' shorthand</entry>
            </row>
            <row>
              <entry>border‑top</entry>
              <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-top">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-top">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-top">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border‑left</entry>
              <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-left">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-left">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-left">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border‑bottom</entry>
              <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-bottom">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-bottom">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-bottom">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border‑right</entry>
              <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border-right">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border-right">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border</entry>
              <entry><code>〈length〉 || 〈border style〉 || 〈color〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#border">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/box.html#propdef-border-right">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#border">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border‑radius</entry>
              <entry><code>[ 〈length〉 | 〈percentage〉 ]{1,4} [ / [ 〈length〉 | 〈percentage> ]{1,4} ]?</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-radius">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-radius">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
              <entry>border‑image</entry>
              <entry><code>〈border-image-source〉 || 〈border-image-slice〉 [ / 〈border-image-width〉 | / 〈border-image-width〉? / 〈border-image-outset〉 ]? || 〈border-image-repeat〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#border-image">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#border-image">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -961,8 +961,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-style">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-style">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-style">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-style">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -971,8 +971,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-width">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-width">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-width">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-width">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -981,8 +981,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>currentColor</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#outline-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#outline-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -991,7 +991,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0px</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-ui/#outline-offset">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-ui/#outline-offset">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1041,8 +1041,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>outline</entry>
              <entry><code>〈outline-color〉 || 〈outline-style〉 || 〈outline-width〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-ui/#propdef-outline">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/ui.html#propdef-outline">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-ui/#propdef-outline">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1075,8 +1075,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>rgba(0,0,0,0)</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-color">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-color">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-color">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-color">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1085,7 +1085,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>border-box</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-clip">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-clip">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1094,7 +1094,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>padding-box</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-origin">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-origin">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1103,7 +1103,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>auto</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#background-size">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#background-size">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1112,8 +1112,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-position">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-position">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-position">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-position">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1122,8 +1122,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>repeat</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-repeat">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-repeat">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-repeat">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-repeat">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1132,8 +1132,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background-image">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background-image">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background-image">CSS3</ulink></entry>
              <entry>not supported: urls without quotes, colors in crossfades</entry>
            </row>
            <row>
@@ -1151,7 +1151,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry>✓</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-background/#box-shadow">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-background/#box-shadow">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1165,8 +1165,8 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><para>background</para></entry>
              <entry><code>[ 〈bg-layer〉 , ]* 〈final-bg-layer〉</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background">CSS2</ulink>,
-                     <ulink url="http://www.w3.org/TR/css3-background/#background">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/2011/REC-CSS2-20110607/colors.html#propdef-background">CSS2</ulink>,
+                     <ulink url="https://www.w3.org/TR/css3-background/#background">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1208,7 +1208,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>all</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-property">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-property">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1217,7 +1217,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0s</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-duration">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-duration">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1226,7 +1226,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>ease</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-timing-function">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-timing-function">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1235,7 +1235,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0s</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition-delay">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition-delay">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1249,7 +1249,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>transition</entry>
              <entry><code>〈single-transition〉 [ , 〈single-transition〉 ]*</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-transitions/#transition">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-transitions/#transition">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1277,7 +1277,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-name">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-name">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1286,7 +1286,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0s</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-duration">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-duration">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1295,7 +1295,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>ease</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-timing-function">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-timing-function">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1304,7 +1304,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>1</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-iteration-count">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-iteration-count">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1313,7 +1313,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>normal</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-direction">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-direction">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1322,7 +1322,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>running</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-play-state">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-play-state">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1331,7 +1331,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>0s</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-delay">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-delay">CSS3</ulink></entry>
              <entry></entry>
            </row>
            <row>
@@ -1340,7 +1340,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry><code>none</code></entry>
              <entry></entry>
              <entry></entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation-fill-mode">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation-fill-mode">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1354,7 +1354,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
              <entry>animation</entry>
              <entry><code>〈single‑animation〉 [ , 〈single‑animation〉]*</code></entry>
              <entry>see individual properties</entry>
-              <entry><ulink url="http://www.w3.org/TR/css3-animations/#animation">CSS3</ulink></entry>
+              <entry><ulink url="https://www.w3.org/TR/css3-animations/#animation">CSS3</ulink></entry>
              <entry></entry>
            </row>
          </tbody>
@@ -1051,7 +1051,7 @@ example_app_window_init (ExampleAppWindow *win)

    <para>The contents of a widget often need to be partially or fully redrawn,
    e.g. when another window is moved and uncovers part of the widget, or
-    when tie window containing it is resized. It is also possible to explicitly
+    when the window containing it is resized. It is also possible to explicitly
    cause part or all of the widget to be redrawn, by calling
    gtk_widget_queue_draw() or its variants. GTK+ takes care of most of the
    details by providing a ready-to-use cairo context to the ::draw signal
@@ -12,9 +12,9 @@
    <releaseinfo>
      This document is for the GTK+ 4 library, version &version;.
      The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gtk4/">http://developer.gnome.org/gtk4/</ulink>.
+      <ulink role="online-location" url="https://developer.gnome.org/gtk4/">https://developer.gnome.org/gtk4/</ulink>.
      If you are looking for the older GTK+ 3 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
+      see <ulink role="online-location" url="https://developer.gnome.org/gtk3/">https://developer.gnome.org/gtk3/</ulink>.
    </releaseinfo>
  </bookinfo>

@@ -329,8 +329,6 @@ gtk_box_query_child_packing
 gtk_box_set_child_packing
 gtk_box_get_baseline_position
 gtk_box_set_baseline_position
-gtk_box_get_center_widget
-gtk_box_set_center_widget
 <SUBSECTION Standard>
 GTK_BOX
 GTK_IS_BOX
@@ -565,6 +563,10 @@ GtkCheckButton
 gtk_check_button_new
 gtk_check_button_new_with_label
 gtk_check_button_new_with_mnemonic
+gtk_check_button_get_draw_indicator
+gtk_check_button_set_draw_indicator
+gtk_check_button_get_inconsistent
+gtk_check_button_set_inconsistent
 <SUBSECTION Standard>
 GTK_CHECK_BUTTON
 GTK_IS_CHECK_BUTTON
@@ -633,8 +635,6 @@ gtk_combo_box_new
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
 gtk_combo_box_new_with_model_and_entry
-gtk_combo_box_new_with_area
-gtk_combo_box_new_with_area_and_entry
 gtk_combo_box_get_wrap_width
 gtk_combo_box_set_wrap_width
 gtk_combo_box_get_row_span_column
@@ -718,8 +718,6 @@ gtk_container_check_resize
 gtk_container_foreach
 gtk_container_get_children
 gtk_container_get_path_for_child
-gtk_container_get_focus_child
-gtk_container_set_focus_child
 gtk_container_get_focus_vadjustment
 gtk_container_set_focus_vadjustment
 gtk_container_get_focus_hadjustment
@@ -1656,12 +1654,10 @@ gtk_label_get_selection_bounds
 gtk_label_get_use_markup
 gtk_label_get_use_underline
 gtk_label_get_single_line_mode
-gtk_label_get_angle
 gtk_label_set_label
 gtk_label_set_use_markup
 gtk_label_set_use_underline
 gtk_label_set_single_line_mode
-gtk_label_set_angle
 gtk_label_get_current_uri
 gtk_label_set_track_visited_links
 gtk_label_get_track_visited_links
@@ -3190,13 +3186,9 @@ GtkToggleButton
 gtk_toggle_button_new
 gtk_toggle_button_new_with_label
 gtk_toggle_button_new_with_mnemonic
-gtk_toggle_button_set_mode
-gtk_toggle_button_get_mode
 gtk_toggle_button_toggled
 gtk_toggle_button_get_active
 gtk_toggle_button_set_active
-gtk_toggle_button_get_inconsistent
-gtk_toggle_button_set_inconsistent

 <SUBSECTION Standard>
 GTK_TOGGLE_BUTTON
@@ -4496,7 +4488,6 @@ gtk_widget_unparent
 gtk_widget_show
 gtk_widget_show_now
 gtk_widget_hide
-gtk_widget_show_all
 gtk_widget_map
 gtk_widget_unmap
 gtk_widget_realize
@@ -4563,7 +4554,6 @@ gtk_widget_set_redraw_on_allocate
 gtk_widget_mnemonic_activate
 gtk_widget_class_install_style_property
 gtk_widget_class_find_style_property
-gtk_widget_class_list_style_properties
 gtk_widget_send_focus_change
 gtk_widget_style_get
 gtk_widget_style_get_valist
@@ -4584,8 +4574,6 @@ gtk_widget_get_size_request
 gtk_widget_set_child_visible
 gtk_widget_set_size_request
 gtk_widget_thaw_child_notify
-gtk_widget_set_no_show_all
-gtk_widget_get_no_show_all
 gtk_widget_list_mnemonic_labels
 gtk_widget_add_mnemonic_label
 gtk_widget_remove_mnemonic_label
@@ -4651,6 +4639,12 @@ gtk_widget_list_action_prefixes
 gtk_widget_get_action_group
 gtk_widget_measure
 gtk_widget_snapshot_child
+gtk_widget_get_next_sibling
+gtk_widget_get_prev_sibling
+gtk_widget_get_first_child
+gtk_widget_get_last_child
+gtk_widget_insert_before
+gtk_widget_insert_after

 <SUBSECTION>
 gtk_widget_get_path
@@ -4681,7 +4675,6 @@ GtkAlign
 gtk_widget_get_halign
 gtk_widget_set_halign
 gtk_widget_get_valign
-gtk_widget_get_valign_with_baseline
 gtk_widget_set_valign
 gtk_widget_get_margin_start
 gtk_widget_set_margin_start
@@ -4761,7 +4754,6 @@ gtk_window_set_screen
 gtk_window_get_screen
 gtk_window_is_active
 gtk_window_is_maximized
-gtk_window_has_toplevel_focus
 gtk_window_list_toplevels
 gtk_window_add_mnemonic
 gtk_window_remove_mnemonic
@@ -4897,7 +4889,6 @@ gtk_get_locale_direction
 gtk_parse_args
 gtk_init
 gtk_init_check
-gtk_init_with_args
 gtk_get_option_group
 gtk_events_pending
 gtk_main
@@ -169,7 +169,7 @@
      <para>
        GTK+ 4 has removed the #GtkContainer::border-width property.
        Use other means to influence the spacing of your containers,
-        such as the CSS border-spacing property.
+        such as the CSS margin and padding properties on child widgets.
      </para>
    </section>

@@ -261,6 +261,18 @@
        use.
      </para>
    </section>
+
+    <section>
+      <title>Stop passing commandline arguments to gtk_init()</title>
+      <para>
+        The gtk_init() and gtk_init_check() functions no longer accept commandline
+        arguments. Just call them without arguments. Other initialization functions
+        that were purely related to commandline argument handling, such as
+        gtk_parse_args() and gtk_get_option_group(), are gone. The APIs to
+        initialize GDK separately are also gone, but it is very unlikely
+        that you are affected by that.
+      </para>
+    </section>
  </section>

 </chapter>
@@ -35,11 +35,11 @@ How do I get started with GTK+?
 </para></question>

 <answer><para>
-The GTK+ <ulink url="http://www.gtk.org">website</ulink> offers some
-<ulink url="http://www.gtk.org/documentation.php">tutorials</ulink> and other
+The GTK+ <ulink url="https://www.gtk.org">website</ulink> offers some
+<ulink url="https://www.gtk.org/documentation.php">tutorials</ulink> and other
 documentation (most of it about GTK+ 2.x, but mostly still applicable).
 More documentation ranging from whitepapers to online books can be found at
-the <ulink url="http://developer.gnome.org">GNOME developer's site</ulink>.
+the <ulink url="https://developer.gnome.org">GNOME developer's site</ulink>.
 After studying these materials you should be well prepared to come back to
 this reference manual for details.
 </para></answer>
@@ -77,7 +77,7 @@ specific widgets and functions.
 <para>
 If you have a question not covered in the manual, feel free to
 ask on the mailing lists and please <ulink
-url="http://bugzilla.gnome.org">file a bug report</ulink> against the
+url="https://bugzilla.gnome.org">file a bug report</ulink> against the
 documentation.
 </para>

@@ -106,7 +106,7 @@ For strings returned from functions, they will be declared "const"
 if they should not be freed. Non-const strings should be
 freed with g_free(). Arrays follow the same rule. If you find an
 undocumented exception to the rules, please report a bug to <ulink
-url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.
+url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
 </para>

 </answer>
@@ -180,7 +180,7 @@ How do I internationalize a GTK+ program?

 <answer>
 <para>
-Most people use <ulink url="http://www.gnu.org/software/gettext/">GNU
+Most people use <ulink url="https://www.gnu.org/software/gettext/">GNU
 gettext</ulink>, already required in order to install GLib. On a UNIX
 or Linux system with gettext installed, type <literal>info gettext</literal>
 to read the documentation.
@@ -281,7 +281,7 @@ zero-terminated strings.
 </para></listitem>
 </itemizedlist>
 More information about Unicode and UTF-8 can be found in the
-<ulink url="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode
+<ulink url="https://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode
 FAQ for Unix/Linux</ulink>.
 GLib provides functions for converting strings between UTF-8 and other
 encodings, see g_locale_to_utf8() and g_convert().
@@ -376,7 +376,7 @@ How do I use GTK+ with C++?
 There are two ways to approach this. The GTK+ header files use the subset
 of C that's also valid C++, so you can simply use the normal GTK+ API
 in a C++ program. Alternatively, you can use a "C++ binding"
-such as <ulink url="http://gtkmm.sourceforge.net/">gtkmm</ulink>
+such as <ulink url="https://www.gtkmm.org/">gtkmm</ulink>
 which provides a native C++ API.
 </para>
 <para>
@@ -415,9 +415,9 @@ How do I use GTK+ with other non-C languages?

 <answer>
 <para>
-See the <ulink url="http://www.gtk.org/language-bindings.php">list of language
+See the <ulink url="https://www.gtk.org/language-bindings.php">list of language
 bindings</ulink> on <ulink
-url="http://www.gtk.org">http://www.gtk.org</ulink>.
+url="https://www.gtk.org">https://www.gtk.org</ulink>.
 </para>

 </answer>
@@ -473,8 +473,8 @@ To draw a piece of text, use a Pango layout and pango_cairo_show_layout().

 <para>
 See also the
-<ulink url="http://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html">Cairo Rendering</ulink>
-section of <ulink url="http://developer.gnome.org/pango/stable/">Pango manual</ulink>.
+<ulink url="https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html">Cairo Rendering</ulink>
+section of <ulink url="https://developer.gnome.org/pango/stable/">Pango manual</ulink>.
 </para>
 </answer>

@@ -505,8 +505,8 @@ pango_layout_get_pixel_size(), using code like the following:

 <para>
 See also the
-<ulink url="http://developer.gnome.org/pango/stable/pango-Layout-Objects.html">Layout Objects</ulink>
-section of <ulink url="http://developer.gnome.org/pango/stable/">Pango manual</ulink>.
+<ulink url="https://developer.gnome.org/pango/stable/pango-Layout-Objects.html">Layout Objects</ulink>
+section of <ulink url="https://developer.gnome.org/pango/stable/">Pango manual</ulink>.
 </para>
 </answer>
 </qandaentry>
@@ -22,7 +22,7 @@ Getting help with GTK+
 <para>
 If you encounter a bug, misfeature, or missing feature in GTK+, please
 file a bug report on 
-<ulink url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>. 
+<ulink url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
 We'd also appreciate reports of incomplete or misleading information in 
 the GTK+ documentation; file those against the "docs" component of the "gtk+"
 product in Bugzilla.
@@ -72,7 +72,7 @@ There are several mailing lists dedicated to GTK+ and related
 libraries. Discussion of GLib, Pango, and ATK in addition to GTK+
 proper is welcome on these lists. You can subscribe or view the
 archives of these lists on 
-<ulink url="http://mail.gnome.org">http://mail.gnome.org</ulink>.
+<ulink url="https://mail.gnome.org">http://mail.gnome.org</ulink>.
 If you aren't subscribed to the list, any message you post to
 the list will be held for manual moderation, which might take
 some days to happen.      
@@ -520,9 +520,9 @@ nevertheless.
  <para>
    GTK+ uses these environment variables to locate icon themes
    and MIME information. For more information, see
-    <ulink url="http://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
-    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
-    and the <ulink url="http://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
+    <ulink url="https://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
+    the <ulink url="https://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
+    and the <ulink url="https://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
  </para>
 </formalpara>

@@ -531,7 +531,7 @@ nevertheless.

  <para>
    GTK+ uses this environment variable to provide startup notification
-    according to the <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
+    according to the <ulink url="https://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
    Following the specification, GTK+ unsets this variable after reading
    it (to keep it from leaking to child processes). So, if you need its
    value for your own purposes, you have to read it before calling
@@ -564,13 +564,20 @@ nevertheless.
    Control-Shift-D keyboard shortcuts, or set the
    <envar>GTK_DEBUG=interactive</envar> environment variable.
  </para>
+  <para>
+    There are a few more environment variables that can be set to influence
+    how the inspector renders its UI. <envar>GTK_INSPECTOR_DISPLAY</envar> and
+    <envar>GTK_INSPECTOR_RENDERER</envar> determine the GDK display and
+    the GSK renderer that the inspector is using.
+  </para>
+
  <para>
    In some situations, it may be inappropriate to give users access to the
    GTK+ inspector. The keyboard shortcuts can be disabled with the
    `enable-inspector-keybinding` key in the `org.gtk.Settings.Debug`
    GSettings schema.
  </para>
- 
+
 </refsect2>

 </refsect1>
@@ -32,7 +32,7 @@ options or environment variables.

 <para>
 For up-to-date information about the current status of this backend, see
-the <ulink url="http://wayland.freedesktop.org/gtk.html">project page</ulink>.
+the <ulink url="https://wiki.gnome.org/Initiatives/Wayland/GTK%2B">project page</ulink>.
 </para>

 </refsect1>
@@ -302,7 +302,7 @@ int main (int argc, char **argv)
 {
  /* If there's no DISPLAY, we silently error out.  We don't want to break
   * headless builds. */
-  if (! gtk_init_check (&argc, &argv))
+  if (! gtk_init_check ())
    return 0;

  toplevels = get_all_widgets ();
@@ -37,7 +37,7 @@ new_widget_info (const char *name,
    {
      info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      info->include_decorations = FALSE;
-      gtk_widget_show_all (widget);
+      gtk_widget_show (widget);
      gtk_container_add (GTK_CONTAINER (info->window), widget);
    }
  info->no_focus = TRUE;
@@ -86,9 +86,9 @@ create_switch (void)
  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  sw = gtk_switch_new ();
  gtk_switch_set_active (GTK_SWITCH (sw), TRUE);
-  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (widget), sw);
  sw = gtk_switch_new ();
-  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (widget), sw);

  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
@@ -150,11 +150,11 @@ create_menu_button (void)
  gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"));

  return new_widget_info ("menu-button", vbox, SMALL);
 }
@@ -203,10 +203,9 @@ create_lockbutton (void)
  widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Lock Button"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Lock Button"));
  gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);

@@ -248,11 +247,11 @@ create_radio (void)

  widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio);
  radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio);
  radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio);
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

@@ -282,7 +281,7 @@ create_accel_label (void)

  button = gtk_button_new_with_label ("Quit");
  gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (widget), button);
-  gtk_widget_set_no_show_all (button, TRUE);
+  gtk_widget_hide (button);

  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  gtk_container_add (GTK_CONTAINER (box), widget);
@@ -404,8 +403,7 @@ create_search_bar (void)
  gtk_container_add (GTK_CONTAINER (box), widget);

  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), view);

  info = new_widget_info ("search-bar", box, SMALL);

@@ -423,8 +421,7 @@ create_action_bar (void)

  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), view);

  widget = gtk_action_bar_new ();

@@ -554,10 +551,9 @@ create_icon_view (void)
  gtk_container_add (GTK_CONTAINER (widget), icon_view);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Icon View"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Icon View"));

  info = new_widget_info ("icon-view", vbox, MEDIUM);
  info->no_focus = FALSE;
@@ -579,10 +575,9 @@ create_color_button (void)
  picker = gtk_color_button_new_with_rgba (&color);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Color Button"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Color Button"));

  return new_widget_info ("color-button", vbox, SMALL);
 }
@@ -597,10 +592,9 @@ create_font_button (void)
  picker = gtk_font_button_new_with_font ("Sans Serif 10");
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Font Button"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Font Button"));

  return new_widget_info ("font-button", vbox, SMALL);
 }
@@ -620,16 +614,14 @@ create_file_button (void)
  gtk_widget_set_size_request (picker, 150, -1);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker);
  gtk_box_pack_start (GTK_BOX (vbox2),
-		      gtk_label_new ("File Button (Files)"),
-		      FALSE, FALSE);
+		      gtk_label_new ("File Button (Files)"));

  gtk_box_pack_start (GTK_BOX (vbox),
-		      vbox2, TRUE, TRUE);
+		      vbox2);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-		      FALSE, FALSE);
+		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  picker = gtk_file_chooser_button_new ("File Chooser Button",
@@ -640,12 +632,11 @@ create_file_button (void)
  g_free (path);
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker);
  gtk_box_pack_start (GTK_BOX (vbox2),
-		      gtk_label_new ("File Button (Select Folder)"),
-		      FALSE, FALSE);
+		      gtk_label_new ("File Button (Select Folder)"));
  gtk_box_pack_start (GTK_BOX (vbox),
-		      vbox2, TRUE, TRUE);
+		      vbox2);

  return new_widget_info ("file-button", vbox, MEDIUM);
 }
@@ -660,18 +651,15 @@ create_separator (void)
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
  gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-		      TRUE, TRUE);
+		      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
  gtk_box_pack_start (GTK_BOX (hbox),
-		      gtk_separator_new (GTK_ORIENTATION_VERTICAL),
-		      TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+		      gtk_separator_new (GTK_ORIENTATION_VERTICAL));
+  gtk_box_pack_start (GTK_BOX (vbox), hbox);
  gtk_box_pack_start (GTK_BOX (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nSeparators",
 				    "justify", GTK_JUSTIFY_CENTER,
-				    NULL),
-		      FALSE, FALSE);
+				    NULL));
  return new_widget_info ("separator", vbox, MEDIUM);
 }

@@ -697,8 +685,7 @@ create_panes (void)
 				 NULL),
 		   FALSE, FALSE);
  gtk_box_pack_start (GTK_BOX (hbox),
-		      pane,
-		      TRUE, TRUE);
+		      pane);
  pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
  gtk_paned_pack1 (GTK_PANED (pane),
 		   g_object_new (GTK_TYPE_FRAME,
@@ -711,15 +698,13 @@ create_panes (void)
 				 NULL),
 		   FALSE, FALSE);
  gtk_box_pack_start (GTK_BOX (hbox),
-		      pane,
-		      TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+		      pane);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox);
  gtk_box_pack_start (GTK_BOX (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nPanes",
 				    "justify", GTK_JUSTIFY_CENTER,
-				    NULL),
-		      FALSE, FALSE);
+				    NULL));
  return new_widget_info ("panes", vbox, MEDIUM);
 }

@@ -881,10 +866,9 @@ create_menubar (void)
  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_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Menu Bar"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Menu Bar"));

  return new_widget_info ("menubar", vbox, SMALL);
 }
@@ -960,10 +944,9 @@ create_progressbar (void)
  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_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Progress Bar"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Progress Bar"));

  return new_widget_info ("progressbar", vbox, SMALL);
 }
@@ -978,10 +961,9 @@ create_level_bar (void)
  gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Level Bar"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Level Bar"));

  return new_widget_info ("levelbar", vbox, SMALL);
 }
@@ -1013,10 +995,9 @@ create_scrollbar (void)
  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_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Scrollbar"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Scrollbar"));

  return new_widget_info ("scrollbar", vbox, SMALL);
 }
@@ -1032,10 +1013,9 @@ create_spinbutton (void)
  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_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Spin Button"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Spin Button"));

  return new_widget_info ("spinbutton", vbox, SMALL);
 }
@@ -1049,13 +1029,12 @@ create_statusbar (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Status Bar"),
-                      FALSE, FALSE);
+                      gtk_label_new ("Status Bar"));
  widget = gtk_statusbar_new ();
  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
  gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on...");

-  gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), widget);

  info = new_widget_info ("statusbar", vbox, SMALL);

@@ -1073,19 +1052,16 @@ create_scales (void)
  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
  gtk_box_pack_start (GTK_BOX (hbox),
 		      gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
-                                                0.0, 100.0, 1.0),
-		      TRUE, TRUE);
+                                                0.0, 100.0, 1.0));
  gtk_box_pack_start (GTK_BOX (hbox),
 		      gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
-                                                0.0, 100.0, 1.0),
-		      TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+                                                0.0, 100.0, 1.0));
+  gtk_box_pack_start (GTK_BOX (vbox), hbox);
  gtk_box_pack_start (GTK_BOX (vbox),
 		      g_object_new (GTK_TYPE_LABEL,
 				    "label", "Horizontal and Vertical\nScales",
 				    "justify", GTK_JUSTIFY_CENTER,
-				    NULL),
-		      FALSE, FALSE);
+				    NULL));
  return new_widget_info ("scales", vbox, MEDIUM);}

 static WidgetInfo *
@@ -1100,10 +1076,9 @@ create_image (void)
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Image"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Image"));

  return new_widget_info ("image", vbox, SMALL);
 }
@@ -1121,10 +1096,9 @@ create_spinner (void)
  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
  gtk_box_pack_start (GTK_BOX (vbox),
-		      gtk_label_new ("Spinner"),
-		      FALSE, FALSE);
+		      gtk_label_new ("Spinner"));

  return new_widget_info ("spinner", vbox, SMALL);
 }
@@ -1143,7 +1117,7 @@ create_volume_button (void)
  gtk_container_add (GTK_CONTAINER (widget), box);

  button = gtk_volume_button_new ();
-  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (box), button);

  gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33);
  popup = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (button));
@@ -1192,10 +1166,9 @@ create_appchooserbutton (void)
  picker = gtk_app_chooser_button_new ("text/plain");
  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker);
  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Application Button"),
-                      FALSE, FALSE);
+                      gtk_label_new ("Application Button"));

  return new_widget_info ("appchooserbutton", vbox, SMALL);
 }
@@ -1262,7 +1235,6 @@ create_headerbar (void)
  button = gtk_button_new ();
  gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("bookmark-new-symbolic", GTK_ICON_SIZE_BUTTON));
  gtk_header_bar_pack_end (GTK_HEADER_BAR (bar), button);
-  gtk_widget_show_all (bar);

  return new_widget_info ("headerbar", window, ASIS);
 }
@@ -1279,10 +1251,9 @@ create_placessidebar (void)
  gtk_widget_set_halign (bar, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (bar, GTK_ALIGN_CENTER);

-  gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), bar);
  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Places Sidebar"),
-                      FALSE, FALSE);
+                      gtk_label_new ("Places Sidebar"));

  return new_widget_info ("placessidebar", vbox, ASIS);
 }
@@ -1312,11 +1283,10 @@ create_stack (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), switcher);
+  gtk_box_pack_start (GTK_BOX (vbox), stack);
  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Stack"),
-                      FALSE, FALSE);
+                      gtk_label_new ("Stack"));

  return new_widget_info ("stack", vbox, ASIS);
 }
@@ -1346,11 +1316,10 @@ create_stack_switcher (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), switcher);
+  gtk_box_pack_start (GTK_BOX (vbox), stack);
  gtk_box_pack_start (GTK_BOX (vbox),
-                      gtk_label_new ("Stack Switcher"),
-                      FALSE, FALSE);
+                      gtk_label_new ("Stack Switcher"));

  return new_widget_info ("stackswitcher", vbox, ASIS);
 }
@@ -1382,9 +1351,9 @@ create_sidebar (void)
  frame = gtk_frame_new (NULL);
  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

-  gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), sidebar);
+  gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL));
+  gtk_box_pack_start (GTK_BOX (hbox), stack);
  gtk_container_add (GTK_CONTAINER (frame), hbox);

  return new_widget_info ("sidebar", frame, ASIS);
@@ -1476,9 +1445,8 @@ create_flow_box (void)

  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"),
-                      FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"));
  info = new_widget_info ("flow-box", vbox, ASIS);
  info->no_focus = FALSE;

@@ -18,7 +18,7 @@ action_activated (GSimpleAction *action,
  g_signal_connect_swapped (dialog, "response",
                            G_CALLBACK (gtk_widget_destroy), dialog);

-  gtk_widget_show_all (dialog);
+  gtk_widget_show (dialog);
 }

 static GActionEntry doc_entries[] = {
@@ -114,7 +114,7 @@ activate (GApplication *app,
  gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
  gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
  gtk_container_add (GTK_CONTAINER (win), button);
-  gtk_widget_show_all (win);
+  gtk_widget_show (win);

  g_object_unref (button_menu);
  g_object_unref (doc_actions);
@@ -293,7 +293,7 @@ new_window (GApplication *app,
                    G_CALLBACK (text_buffer_changed_cb), window);
  text_buffer_changed_cb (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)), window);

-  gtk_widget_show_all (GTK_WIDGET (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }

 static void
@@ -430,7 +430,7 @@ edit_accels (GSimpleAction *action,
  g_object_set_data (G_OBJECT (dialog), "combo", combo);
  g_object_set_data (G_OBJECT (dialog), "entry", entry);

-  gtk_widget_show_all (dialog);
+  gtk_widget_show (dialog);
 }

 static gboolean
@@ -15,7 +15,7 @@ main (int   argc,
  GObject *window;
  GObject *button;

-  gtk_init (&argc, &argv);
+  gtk_init ();

  /* Construct a GtkBuilder instance and load our UI description */
  builder = gtk_builder_new ();
@@ -172,7 +172,7 @@ activate (GtkApplication *app,
                                     | GDK_BUTTON_PRESS_MASK
                                     | GDK_POINTER_MOTION_MASK);

-  gtk_widget_show_all (window);
+  gtk_widget_show (window);
 }

 int
@@ -49,12 +49,7 @@ activate (GtkApplication *app,
   */
  gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 2, 1);

-  /* Now that we are done packing our widgets, we show them all
-   * in one go, by calling gtk_widget_show_all() on the window.
-   * This call recursively calls gtk_widget_show() on all widgets
-   * that are contained in the window, directly or indirectly.
-   */
-  gtk_widget_show_all (window);
+  gtk_widget_show (window);

 }

@@ -27,7 +27,7 @@ activate (GtkApplication *app,
  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
  gtk_container_add (GTK_CONTAINER (button_box), button);

-  gtk_widget_show_all (window);
+  gtk_widget_show (window);
 }

 int
@@ -117,7 +117,7 @@ new_window (GApplication *app,
        }
    }

-  gtk_widget_show_all (GTK_WIDGET (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }

 static void
@@ -27,15 +27,13 @@ activate_cb (GtkApplication *app,

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
  gtk_container_add (GTK_CONTAINER (search_bar), box);
-  gtk_widget_show (box);

  entry = gtk_search_entry_new ();
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
-  gtk_widget_show (entry);
+  gtk_widget_set_hexpand (entry, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry);

  menu_button = gtk_menu_button_new ();
-  gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE, FALSE);
-  gtk_widget_show (menu_button);
+  gtk_box_pack_start (GTK_BOX (box), menu_button);

  gtk_search_bar_connect_entry (GTK_SEARCH_BAR (search_bar), GTK_ENTRY (entry));

@@ -46,7 +46,7 @@ new_window (GApplication *app,
        }
    }

-  gtk_widget_show_all (GTK_WIDGET (window));
+  gtk_widget_show (GTK_WIDGET (window));
 }

 static void
@@ -9,7 +9,7 @@ activate (GtkApplication* app,
  window = gtk_application_window_new (app);
  gtk_window_set_title (GTK_WINDOW (window), "Window");
  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-  gtk_widget_show_all (window);
+  gtk_widget_show (window);
 }

 int
@@ -172,93 +172,7 @@ static const GDebugKey gdk_debug_keys[] = {
  { "opengl",        GDK_DEBUG_OPENGL },
  { "vulkan",        GDK_DEBUG_VULKAN }
 };
-
-static gboolean
-gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
-{
-  guint debug_value = g_parse_debug_string (value,
-                                            (GDebugKey *) gdk_debug_keys,
-                                            G_N_ELEMENTS (gdk_debug_keys));
-
-  if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
-    {
-      g_set_error (error,
-                   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
-                   _("Error parsing option --gdk-debug"));
-      return FALSE;
-    }
-
-  _gdk_debug_flags |= debug_value;
-
-  return TRUE;
-}
-
-static gboolean
-gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
-{
-  guint debug_value = g_parse_debug_string (value,
-                                            (GDebugKey *) gdk_debug_keys,
-                                            G_N_ELEMENTS (gdk_debug_keys));
-
-  if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
-    {
-      g_set_error (error,
-                   G_OPTION_ERROR, G_OPTION_ERROR_FAILED,
-                   _("Error parsing option --gdk-no-debug"));
-      return FALSE;
-    }
-
-  _gdk_debug_flags &= ~debug_value;
-
-  return TRUE;
-}
-#endif /* G_ENABLE_DEBUG */
-
-static gboolean
-gdk_arg_class_cb (const char *key, const char *value, gpointer user_data, GError **error)
-{
-  gdk_set_program_class (value);
-  gdk_progclass_overridden = TRUE;
-
-  return TRUE;
-}
-
-static gboolean
-gdk_arg_name_cb (const char *key, const char *value, gpointer user_data, GError **error)
-{
-  g_set_prgname (value);
-
-  return TRUE;
-}
-
-static const GOptionEntry gdk_args[] = {
-  { "class",        0, 0,                     G_OPTION_ARG_CALLBACK, gdk_arg_class_cb,
-    /* Description of --class=CLASS in --help output */        N_("Program class as used by the window manager"),
-    /* Placeholder in --class=CLASS in --help output */        N_("CLASS") },
-  { "name",         0, 0,                     G_OPTION_ARG_CALLBACK, gdk_arg_name_cb,
-    /* Description of --name=NAME in --help output */          N_("Program name as used by the window manager"),
-    /* Placeholder in --name=NAME in --help output */          N_("NAME") },
-#ifndef G_OS_WIN32
-  { "display",      0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,   &_gdk_display_name,
-    /* Description of --display=DISPLAY in --help output */    N_("X display to use"),
-    /* Placeholder in --display=DISPLAY in --help output */    N_("DISPLAY") },
 #endif
-#ifdef G_ENABLE_DEBUG
-  { "gdk-debug",    0, 0, G_OPTION_ARG_CALLBACK, gdk_arg_debug_cb,  
-    /* Description of --gdk-debug=FLAGS in --help output */    N_("GDK debugging flags to set"),
-    /* Placeholder in --gdk-debug=FLAGS in --help output */    N_("FLAGS") },
-  { "gdk-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, gdk_arg_no_debug_cb, 
-    /* Description of --gdk-no-debug=FLAGS in --help output */ N_("GDK debugging flags to unset"),
-    /* Placeholder in --gdk-no-debug=FLAGS in --help output */ N_("FLAGS") },
-#endif 
-  { NULL }
-};
-
-void
-gdk_add_option_entries (GOptionGroup *group)
-{
-  g_option_group_add_entries (group, gdk_args);
-}

 static gpointer
 register_resources (gpointer dummy G_GNUC_UNUSED)
@@ -327,53 +241,6 @@ gdk_pre_parse (void)
    }
 }

-/**
- * gdk_parse_args:
- * @argc: the number of command line arguments.
- * @argv: (inout) (array length=argc): the array of command line arguments.
- * 
- * Parse command line arguments, and store for future
- * use by calls to gdk_display_open().
- *
- * Any arguments used by GDK are removed from the array and @argc and @argv are
- * updated accordingly.
- *
- * You shouldn’t call this function explicitly if you are using
- * gtk_init(), gtk_init_check(), gdk_init(), or gdk_init_check().
- *
- * Since: 2.2
- **/
-void
-gdk_parse_args (int    *argc,
-                char ***argv)
-{
-  GOptionContext *option_context;
-  GOptionGroup *option_group;
-  GError *error = NULL;
-
-  if (gdk_initialized)
-    return;
-
-  gdk_pre_parse ();
-
-  option_context = g_option_context_new (NULL);
-  g_option_context_set_ignore_unknown_options (option_context, TRUE);
-  g_option_context_set_help_enabled (option_context, FALSE);
-  option_group = g_option_group_new (NULL, NULL, NULL, NULL, NULL);
-  g_option_context_set_main_group (option_context, option_group);
-
-  g_option_group_add_entries (option_group, gdk_args);
-
-  if (!g_option_context_parse (option_context, argc, argv, &error))
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-    }
-  g_option_context_free (option_context);
-
-  GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));
-}
-
 /**
 * gdk_get_display_arg_name:
 *
@@ -423,60 +290,6 @@ gdk_display_open_default (void)
  return display;
 }

-/**
- * gdk_init_check:
- * @argc: (inout): the number of command line arguments.
- * @argv: (array length=argc) (inout): the array of command line arguments.
- *
- * Initializes the GDK library and connects to the windowing system,
- * returning %TRUE on success.
- *
- * Any arguments used by GDK are removed from the array and @argc and @argv
- * are updated accordingly.
- *
- * GTK+ initializes GDK in gtk_init() and so this function is not usually
- * needed by GTK+ applications.
- *
- * Returns: %TRUE if initialization succeeded.
- */
-gboolean
-gdk_init_check (int    *argc,
-                char ***argv)
-{
-  gdk_parse_args (argc, argv);
-
-  return gdk_display_open_default () != NULL;
-}
-
-
-/**
- * gdk_init:
- * @argc: (inout): the number of command line arguments.
- * @argv: (array length=argc) (inout): the array of command line arguments.
- *
- * Initializes the GDK library and connects to the windowing system.
- * If initialization fails, a warning message is output and the application
- * terminates with a call to `exit(1)`.
- *
- * Any arguments used by GDK are removed from the array and @argc and @argv
- * are updated accordingly.
- *
- * GTK+ initializes GDK in gtk_init() and so this function is not usually
- * needed by GTK+ applications.
- */
-void
-gdk_init (int *argc, char ***argv)
-{
-  if (!gdk_init_check (argc, argv))
-    {
-      const char *display_name = gdk_get_display_arg_name ();
-      g_warning ("cannot open display: %s", display_name ? display_name : "");
-      exit(1);
-    }
-}
-
-
-
 /**
 * SECTION:threads
 * @Short_description: Functions for using GDK in multi-threaded programs
@@ -932,7 +745,10 @@ gdk_threads_add_timeout_seconds (guint       interval,
 const char *
 gdk_get_program_class (void)
 {
-  return gdk_progclass;
+  if (gdk_progclass)
+    return gdk_progclass;
+
+  return "GTK+ Application";
 }

 /**
@@ -961,7 +777,7 @@ gdk_set_program_class (const char *program_class)
 * gdk_disable_multidevice:
 *
 * Disables multidevice support in GDK. This call must happen prior
- * to gdk_display_open(), gtk_init(), gtk_init_with_args() or
+ * to gdk_display_open(), gtk_init() or
 * gtk_init_check() in order to take effect.
 *
 * Most common GTK+ applications won’t ever need to call this. Only
@@ -34,9 +34,8 @@
 *
 * GDK does not wrap the cairo API, instead it allows to create cairo
 * contexts which can be used to draw on #GdkWindows. Additional
- * functions allow use #GdkRectangles with cairo and to use #GdkColors,
- * #GdkRGBAs, #GdkPixbufs and #GdkWindows as sources for drawing
- * operations.
+ * functions allow use #GdkRectangles with cairo and to use #GdkRGBAs,
+ * #GdkPixbufs and #GdkWindows as sources for drawing operations.
 */


--- a/Show More
+++ b/Show More