[gtk: 12/12] Merge branch 'matthiasc/for-master' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 12/12] Merge branch 'matthiasc/for-master' into 'master'
- Date: Fri, 17 Apr 2020 16:24:05 +0000 (UTC)
commit d4e53b14cbba62bcd4f7c58e7c76800739067de0
Merge: c7d871570f 96f9f9585f
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Apr 17 16:23:29 2020 +0000
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!1703
demos/constraint-editor/constraint-editor-window.c | 6 +-
demos/gtk-demo/application.ui | 2 +-
demos/gtk-demo/blendmodes.ui | 2 +-
demos/gtk-demo/colorsel.c | 1 -
demos/gtk-demo/demo.ui | 2 +-
demos/gtk-demo/demotaggedentry.c | 2 +-
demos/gtk-demo/dnd.c | 14 ++--
demos/gtk-demo/drawingarea.c | 2 -
demos/gtk-demo/editable_cells.c | 3 +-
demos/gtk-demo/expander.c | 2 +-
demos/gtk-demo/fishbowl.ui | 2 +-
demos/gtk-demo/fontrendering.ui | 2 +-
demos/gtk-demo/iconview.c | 3 +-
demos/gtk-demo/images.c | 5 --
demos/gtk-demo/list_store.c | 3 +-
demos/gtk-demo/listbox.ui | 18 +++--
demos/gtk-demo/main.c | 2 -
demos/gtk-demo/panes.c | 3 -
demos/gtk-demo/tree_store.c | 3 +-
demos/widget-factory/widget-factory.ui | 28 ++++----
docs/reference/gtk/gtk4-sections.txt | 22 +++----
docs/tools/widgets.c | 22 ++-----
examples/drawing.c | 1 -
gtk/gtkbutton.c | 75 ++++++++++-----------
gtk/gtkbutton.h | 6 +-
gtk/gtkcalendar.c | 68 ++++++++++++-------
gtk/gtkcustompaperunixdialog.c | 3 +-
gtk/gtkentrycompletion.c | 4 --
gtk/gtkenums.h | 36 ----------
gtk/gtkframe.c | 76 +---------------------
gtk/gtkframe.h | 6 --
gtk/gtklinkbutton.c | 2 +-
gtk/gtkmenubutton.c | 61 ++++++++---------
gtk/gtkmenubutton.h | 6 +-
gtk/gtkmountoperation.c | 2 +-
gtk/gtknotebook.c | 2 +-
gtk/gtkpaned.c | 2 -
gtk/gtkplacessidebar.c | 2 +-
gtk/gtkplacesview.c | 2 +-
gtk/gtkscrolledwindow.c | 76 +++++++++++-----------
gtk/gtkscrolledwindow.h | 6 +-
gtk/gtktreeviewcolumn.c | 10 +--
gtk/gtkviewport.c | 69 +-------------------
gtk/gtkviewport.h | 7 --
gtk/inspector/css-editor.ui | 4 +-
gtk/inspector/data-list.ui | 2 +-
gtk/inspector/object-tree.c | 2 +-
gtk/inspector/recorder.c | 4 +-
gtk/inspector/recorder.ui | 8 +--
gtk/inspector/resource-list.ui | 4 +-
gtk/inspector/type-info.ui | 4 +-
gtk/inspector/window.ui | 4 +-
gtk/theme/Adwaita/_common.scss | 7 ++
gtk/ui/gtkaboutdialog.ui | 6 +-
gtk/ui/gtkappchooserwidget.ui | 2 +-
gtk/ui/gtkemojichooser.ui | 20 +++---
gtk/ui/gtkfontchooserwidget.ui | 4 +-
gtk/ui/gtkplacesview.ui | 5 +-
gtk/ui/gtkprintunixdialog.ui | 6 +-
gtk/ui/gtkscalebutton.ui | 6 +-
gtk/ui/gtkstatusbar.ui | 1 -
tests/print-editor.c | 3 +-
tests/testcalendar.c | 1 -
tests/testcellrenderertext.c | 2 +-
tests/testexpander.c | 2 +-
tests/testfilechooserbutton.c | 1 -
tests/testflowbox.c | 1 -
tests/testframe.c | 17 -----
tests/testgtk.c | 13 ----
tests/testtreeedit.c | 2 +-
tests/testtreefocus.c | 4 +-
tests/testtreelistmodel.c | 2 +-
tests/testtreesort.c | 8 +--
tests/testverticalcells.c | 2 +-
testsuite/gtk/focus-chain/widget-factory.ui | 28 ++++----
testsuite/gtk/focus-chain/widget-factory2.ui | 28 ++++----
testsuite/gtk/focus-chain/widget-factory3.ui | 28 ++++----
testsuite/reftests/link-coloring.ui | 4 +-
testsuite/reftests/treeview-crash-too-wide.ref.ui | 2 +-
testsuite/reftests/treeview-crash-too-wide.ui | 2 +-
80 files changed, 323 insertions(+), 587 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]