[gtk: 5/5] Merge branch 'wip/otte/builder' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 5/5] Merge branch 'wip/otte/builder' into 'master'
- Date: Thu, 12 Dec 2019 20:36:54 +0000 (UTC)
commit c33a7670d098c8e5337db121fdfc9cb56cc62ea2
Merge: bbb56d8216 5015730212
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Dec 12 20:36:08 2019 +0000
Merge branch 'wip/otte/builder' into 'master'
More builder work
Closes #2267
See merge request GNOME/gtk!1230
demos/widget-factory/widget-factory.c | 30 +-
docs/reference/gtk/gtk4-sections.txt | 38 ++-
gtk/gtk.h | 1 +
gtk/gtkbuilder.c | 611 +++++++++++++---------------------
gtk/gtkbuilder.h | 37 +-
gtk/gtkbuilderparser.c | 35 +-
gtk/gtkbuilderprivate.h | 5 +
gtk/gtkbuilderscope.c | 511 ++++++++++++++++++++++++++++
gtk/gtkbuilderscope.h | 124 +++++++
gtk/gtkbuilderscopeprivate.h | 43 +++
gtk/gtktypes.h | 8 +-
gtk/gtkwidget.c | 116 ++-----
gtk/gtkwidget.h | 10 +-
gtk/meson.build | 2 +
testsuite/gtk/defaultvalue.c | 5 +
testsuite/reftests/reftest-snapshot.c | 249 ++++++++------
16 files changed, 1171 insertions(+), 654 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]