[gtk: 3/3] Merge branch 'grid-api' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 43816ba8d9cfefac9d6887a68b83dd57b74fc04a
Merge: 7fe7d5ab4f 71be1751c6
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 2 23:17:40 2020 +0000

    Merge branch 'grid-api' into 'master'
    
    grid layout: Rename some properties
    
    Closes #2967
    
    See merge request GNOME/gtk!2345

 demos/constraint-editor/constraint-editor.ui       |   64 +-
 demos/constraint-editor/guide-editor.ui            |   56 +-
 demos/gtk-demo/application.ui                      |   16 +-
 demos/gtk-demo/blendmodes.ui                       |   96 +-
 demos/gtk-demo/filtermodel.ui                      |   24 +-
 demos/gtk-demo/fontrendering.ui                    |   44 +-
 demos/gtk-demo/listbox.ui                          |   24 +-
 demos/gtk-demo/revealer.ui                         |   36 +-
 demos/gtk-demo/scale.ui                            |   24 +-
 demos/gtk-demo/spinbutton.ui                       |   48 +-
 demos/gtk-demo/stack.ui                            |    8 +-
 demos/icon-browser/window.ui                       |   64 +-
 demos/node-editor/node-editor-window.ui            |   16 +-
 demos/widget-factory/widget-factory.ui             |  118 +-
 docs/reference/gtk/getting_started.md              |   28 +-
 docs/reference/gtk/gtk4-sections.txt               |    8 +-
 examples/application6/prefs.ui                     |   16 +-
 examples/application7/prefs.ui                     |   16 +-
 examples/application8/prefs.ui                     |   16 +-
 examples/application9/prefs.ui                     |   16 +-
 examples/builder.ui                                |   12 +-
 gtk/gtkgrid.c                                      |  112 +-
 gtk/gtkgrid.h                                      |   12 +-
 gtk/gtkgridlayout.c                                |   94 +-
 gtk/gtkgridlayout.h                                |   12 +-
 gtk/gtkwidget.c                                    |    8 +-
 gtk/inspector/resource-list.ui                     |   24 +-
 gtk/tools/gtk-builder-tool-simplify.c              |   24 +-
 gtk/ui/gtkcoloreditor.ui                           |   56 +-
 gtk/ui/gtkemojichooser.ui                          |   12 +-
 gtk/ui/gtkfilechooserwidget.ui                     |   36 +-
 gtk/ui/gtkfontchooserwidget.ui                     |   48 +-
 gtk/ui/gtkpagesetupunixdialog.ui                   |   40 +-
 gtk/ui/gtkplacesview.ui                            |    8 +-
 gtk/ui/gtkprintunixdialog.ui                       |  180 +--
 tests/dialog.ui                                    |   32 +-
 tests/testoverlay.c                                |   12 +-
 tests/testsplitheaders.ui                          |   16 +-
 testsuite/css/nodes/buttons.ui                     |   36 +-
 testsuite/gtk/builder.c                            |    4 +-
 testsuite/gtk/focus-chain/widget-factory.ui        |  118 +-
 testsuite/gtk/focus-chain/widget-factory2.ui       |  118 +-
 testsuite/gtk/focus-chain/widget-factory3.ui       |  118 +-
 testsuite/gtk/grid-layout.c                        |   56 +-
 testsuite/reftests/animation-direction.ref.ui      |  128 +-
 testsuite/reftests/animation-direction.ui          |  128 +-
 .../animation-fill-mode-iteration-count.ref.ui     |  256 ++--
 .../animation-fill-mode-iteration-count.ui         |  256 ++--
 .../reftests/background-color-transparent.ref.ui   |    8 +-
 testsuite/reftests/background-color-transparent.ui |    8 +-
 testsuite/reftests/background-position.ui          |   36 +-
 testsuite/reftests/background-repeat.ref.ui        |   16 +-
 testsuite/reftests/background-repeat.ui            |   12 +-
 testsuite/reftests/background-size-keywords.ref.ui |   48 +-
 testsuite/reftests/background-size-keywords.ui     |   48 +-
 testsuite/reftests/background-size.ref.ui          |   48 +-
 testsuite/reftests/background-size.ui              |   48 +-
 .../border-corner-zero-width-rendering.ref.ui      |   64 +-
 .../reftests/border-corner-zero-width-rendering.ui |   64 +-
 testsuite/reftests/border-image-excess-size.ref.ui |   16 +-
 testsuite/reftests/border-style.ref.ui             |    4 +-
 testsuite/reftests/border-style.ui                 |   16 +-
 testsuite/reftests/box-order.ref.ui                |   20 +-
 testsuite/reftests/box-order.ui                    |   20 +-
 testsuite/reftests/box-shadow-spec-inset.ref.ui    |   24 +-
 testsuite/reftests/box-shadow-spec-inset.ui        |   24 +-
 testsuite/reftests/cross-fade-syntax.ref.ui        |  400 +++---
 testsuite/reftests/cross-fade-syntax.ui            |  400 +++---
 testsuite/reftests/css-em-label-size.ref.ui        |   56 +-
 testsuite/reftests/css-em-label-size.ui            |   56 +-
 testsuite/reftests/css-match-descendant-later.ui   |    8 +-
 testsuite/reftests/css-match-exact.ui              |    4 +-
 testsuite/reftests/grid-empty-with-spacing.ui      |    4 +-
 testsuite/reftests/grid-expand.ref.ui              |   12 +-
 testsuite/reftests/grid-expand.ui                  |   12 +-
 testsuite/reftests/grid-homogeneous.ref.ui         |   32 +-
 testsuite/reftests/grid-homogeneous.ui             |   48 +-
 testsuite/reftests/grid-spacing1.ui                |   28 +-
 testsuite/reftests/grid-spacing2.ui                |   44 +-
 testsuite/reftests/grid-spacing3.ref.ui            |   16 +-
 testsuite/reftests/grid-spacing3.ui                |   16 +-
 testsuite/reftests/grid-wfh.ref.ui                 |    8 +-
 testsuite/reftests/grid-wfh.ui                     |    8 +-
 testsuite/reftests/gtk-image-effect-inherit.ui     |   12 +-
 testsuite/reftests/icon-style-basics.ref.ui        |  168 +--
 testsuite/reftests/icon-style-basics.ui            |  168 +--
 testsuite/reftests/icon-vfuncs.ref.ui              |   40 +-
 testsuite/reftests/icon-vfuncs.ui                  |   40 +-
 testsuite/reftests/iconview-empty.ref.ui           |   64 +-
 testsuite/reftests/iconview-empty.ui               |   64 +-
 testsuite/reftests/label-sizing.ref.ui             | 1300 ++++++++++----------
 testsuite/reftests/label-sizing.ui                 | 1300 ++++++++++----------
 testsuite/reftests/label-wrap-justify.ref.ui       |   16 +-
 testsuite/reftests/label-wrap-justify.ui           |   16 +-
 testsuite/reftests/named-colors.ref.ui             |  600 ++++-----
 testsuite/reftests/named-colors.ui                 |  600 ++++-----
 testsuite/reftests/paned-undersized.ui             |    4 +-
 testsuite/reftests/partial-rounded-border.ref.ui   |   16 +-
 testsuite/reftests/partial-rounded-border.ui       |   16 +-
 testsuite/reftests/quit-mnemonic.ui                |    8 +-
 testsuite/reftests/rotated-layout.ref.ui           |    8 +-
 testsuite/reftests/rotated-layout.ui               |    8 +-
 testsuite/reftests/separator-size.ref.ui           |   32 +-
 testsuite/reftests/separator-size.ui               |   20 +-
 testsuite/reftests/sizegroups-basics.ref.ui        |   12 +-
 testsuite/reftests/sizegroups-basics.ui            |   12 +-
 .../sizegroups-evolution-identity-page.ref.ui      |   60 +-
 .../reftests/sizegroups-evolution-identity-page.ui |   56 +-
 testsuite/reftests/textview-border-windows.ref.ui  |   20 +-
 testsuite/reftests/window-height-for-width.ref.ui  |    8 +-
 testsuite/reftests/window-height-for-width.ui      |    8 +-
 testsuite/tools/simplify-data-3to4/grid.expected   |   36 +-
 .../simplify-data-3to4/office-runner.expected      |   28 +-
 113 files changed, 4555 insertions(+), 4555 deletions(-)
---