[gtk: 9/9] Merge branch 'wip/otte/toolbar' into 'master'



commit 24e28309fb875cd5946c34ff475c35ac7716a755
Merge: 645af0917c 44e153d8a8
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Feb 7 13:25:51 2020 +0000

    Merge branch 'wip/otte/toolbar' into 'master'
    
    remove GtkToolbar
    
    See merge request GNOME/gtk!1383

 demos/gtk-demo/application.c                       |    8 +-
 demos/gtk-demo/application.ui                      |   13 +-
 demos/gtk-demo/builder.c                           |    4 -
 demos/gtk-demo/css_shadows.c                       |   19 +-
 demos/gtk-demo/demo.ui                             |   17 +-
 demos/gtk-demo/iconview.c                          |   32 +-
 demos/gtk-demo/themes.ui                           |  160 --
 demos/gtk-demo/theming.ui                          |  159 --
 demos/gtk-demo/theming_style_classes.c             |    4 +-
 demos/widget-factory/widget-factory.ui             |   90 +-
 docs/reference/gtk/gtk4-docs.xml                   |   10 +-
 docs/reference/gtk/gtk4-sections.txt               |  215 --
 docs/reference/gtk/gtk4.types.in                   |    7 -
 docs/reference/gtk/migrating-3to4.xml              |   17 +-
 docs/reference/gtk/visual_index.xml                |    3 -
 examples/bp/bloatpad.c                             |   32 +-
 gtk/a11y/gtkimageaccessible.c                      |   47 +-
 gtk/gtk-autocleanups.h                             |    8 -
 gtk/gtk.h                                          |    8 -
 gtk/gtkcustompaperunixdialog.c                     |   44 +-
 gtk/gtkenums.h                                     |   24 +-
 gtk/gtkmenutoolbutton.c                            |  438 ---
 gtk/gtkmenutoolbutton.h                            |   57 -
 gtk/gtkradiotoolbutton.c                           |  217 --
 gtk/gtkradiotoolbutton.h                           |   53 -
 gtk/gtkseparatortoolitem.c                         |  228 --
 gtk/gtkseparatortoolitem.h                         |   50 -
 gtk/gtkstylecontext.h                              |   18 -
 gtk/gtktextview.c                                  |    1 -
 gtk/gtktoggletoolbutton.c                          |  258 --
 gtk/gtktoggletoolbutton.h                          |   83 -
 gtk/gtktoolbar.c                                   | 2897 --------------------
 gtk/gtktoolbar.h                                   |   95 -
 gtk/gtktoolbarprivate.h                            |   41 -
 gtk/gtktoolbutton.c                                | 1025 -------
 gtk/gtktoolbutton.h                                |  112 -
 gtk/gtktoolitem.c                                  |  822 ------
 gtk/gtktoolitem.h                                  |  141 -
 gtk/gtktoolshell.c                                 |  203 --
 gtk/gtktoolshell.h                                 |   91 -
 gtk/meson.build                                    |   16 -
 gtk/theme/Adwaita/_common.scss                     |   73 +-
 gtk/theme/HighContrast/_common.scss                |   59 +-
 po-properties/POTFILES.skip                        |    3 -
 po/POTFILES.skip                                   |    3 -
 tests/meson.build                                  |    2 -
 tests/stresstest-toolbar.c                         |  157 --
 tests/testtoolbar.c                                |  642 -----
 tests/visuals/inline-toolbar-horizontal.ui         |  119 -
 tests/visuals/inline-toolbar-vertical.ui           |  122 -
 tests/visuals/primary-toolbar.ui                   |  211 --
 testsuite/gtk/builder.c                            |    2 +-
 testsuite/reftests/border-image-excess-size.css    |    2 +-
 testsuite/reftests/border-image-excess-size.ref.ui |   12 +-
 testsuite/reftests/border-image-excess-size.ui     |    3 +-
 55 files changed, 162 insertions(+), 9015 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]