[gtk/gtk-3-24: 15/15] Merge branch 'wip/carlosg/controllers-backport' into 'gtk-3-24'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 15/15] Merge branch 'wip/carlosg/controllers-backport' into 'gtk-3-24'
- Date: Wed, 18 Jul 2018 00:25:39 +0000 (UTC)
commit cc73241c7b681f91587b5606d04688356b1b8a29
Merge: ac358d2507 9ee60777e7
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jul 18 00:23:37 2018 +0000
Merge branch 'wip/carlosg/controllers-backport' into 'gtk-3-24'
Wip/carlosg/controllers backport
See merge request GNOME/gtk!246
demos/gtk-demo/Makefile.am | 1 +
demos/gtk-demo/demo.gresource.xml | 1 +
demos/gtk-demo/paint.c | 255 +++++++++++++++++++
docs/reference/gtk/gtk3.types.in | 1 +
gtk/Makefile.am | 9 +
gtk/gtk.h | 4 +
gtk/gtkeventcontrollerkey.c | 271 ++++++++++++++++++++
gtk/gtkeventcontrollerkey.h | 63 +++++
gtk/gtkeventcontrollermotion.c | 169 +++++++++++++
gtk/gtkeventcontrollermotion.h | 50 ++++
gtk/gtkeventcontrollerscroll.c | 517 ++++++++++++++++++++++++++++++++++++++
gtk/gtkeventcontrollerscroll.h | 80 ++++++
gtk/gtkgesturestylus.c | 269 ++++++++++++++++++++
gtk/gtkgesturestylus.h | 59 +++++
gtk/gtkgesturestylusprivate.h | 51 ++++
po/POTFILES.in | 4 +
16 files changed, 1804 insertions(+)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]