[gtk: 39/39] Merge branch 'keymap-rework-2' into 'master'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 39/39] Merge branch 'keymap-rework-2' into 'master'
- Date: Mon, 6 Apr 2020 20:56:38 +0000 (UTC)
commit 2486f46c0b098e6332ef5bdeda4b78c0ffc0a3cb
Merge: da6faf321c c03b7e4d45
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Apr 6 20:56:06 2020 +0000
Merge branch 'keymap-rework-2' into 'master'
Keymap rework 2
See merge request GNOME/gtk!1635
docs/reference/gdk/gdk4-sections.txt | 50 ++-----
docs/reference/gdk/gdk4.types | 1 -
docs/reference/gtk/gtk4-sections.txt | 3 -
docs/reference/gtk/migrating-3to4.xml | 73 ++++++++--
gdk/broadway/broadway.js | 10 +-
gdk/broadway/gdkeventsource.c | 14 +-
gdk/broadway/gdkkeys-broadway.c | 15 --
gdk/gdk-autocleanup.h | 1 -
gdk/gdkdevice.c | 133 ++++++++++++++++++
gdk/gdkdevice.h | 18 +++
gdk/gdkdisplay.c | 72 ++++++++++
gdk/gdkdisplay.h | 12 +-
gdk/gdkevents.c | 249 ++++++++++++++++++++++++++++------
gdk/gdkevents.h | 32 ++++-
gdk/gdkeventsprivate.h | 44 +++---
gdk/gdkinternals.h | 2 +
gdk/gdkkeys.c | 240 ++++++++++++--------------------
gdk/gdkkeys.h | 98 -------------
gdk/gdkkeysprivate.h | 41 +++++-
gdk/gdksurface.c | 29 ++--
gdk/gdktypes.h | 149 ++++++--------------
gdk/quartz/gdkevents-quartz.c | 6 +-
gdk/quartz/gdkkeys-quartz.c | 35 -----
gdk/wayland/gdkdevice-wayland.c | 109 +++++++++++++--
gdk/wayland/gdkkeys-wayland.c | 95 ++-----------
gdk/wayland/gdkprivate-wayland.h | 2 +
gdk/win32/gdkdevice-win32.c | 2 +-
gdk/win32/gdkdevice-wintab.c | 2 +-
gdk/win32/gdkdevicemanager-win32.c | 2 +-
gdk/win32/gdkdrag-win32.c | 10 +-
gdk/win32/gdkevents-win32.c | 63 +++++----
gdk/win32/gdkkeys-win32.c | 18 +--
gdk/win32/gdkwin32.h | 1 -
gdk/win32/gdkwin32keys.h | 3 +-
gdk/x11/gdkdevicemanager-xi2.c | 40 +++++-
gdk/x11/gdkdisplay-x11.c | 1 +
gdk/x11/gdkdrag-x11.c | 12 +-
gdk/x11/gdkkeys-x11.c | 126 ++++++-----------
gdk/x11/gdkx-autocleanups.h | 1 -
gdk/x11/gdkx.h | 1 -
gdk/x11/gdkx11keys.h | 3 +-
gdk/x11/meson.build | 1 -
gtk/a11y/gtkbuttonaccessible.c | 4 +-
gtk/a11y/gtkcomboboxaccessible.c | 2 +-
gtk/a11y/gtkentryaccessible.c | 2 +-
gtk/a11y/gtkexpanderaccessible.c | 2 +-
gtk/a11y/gtktextaccessible.c | 2 +-
gtk/gtkaccelgroup.c | 186 ++++---------------------
gtk/gtkaccelgroup.h | 6 +-
gtk/gtkapplication-quartz-menu.c | 2 +-
gtk/gtkcellrendereraccel.c | 51 +------
gtk/gtkcolorplane.c | 2 +-
gtk/gtkcombobox.c | 8 +-
gtk/gtkeventcontrollerkey.c | 2 +-
gtk/gtkfilechooserwidget.c | 22 +--
gtk/gtkflowbox.c | 14 +-
gtk/gtkiconview.c | 24 +---
gtk/gtkimcontextsimple.c | 43 +++---
gtk/gtkimmulticontext.c | 6 +-
gtk/gtklabel.c | 14 +-
gtk/gtklistbox.c | 14 +-
gtk/gtknotebook.c | 8 +-
gtk/gtkpasswordentry.c | 30 ++--
gtk/gtkplacessidebar.c | 2 +-
gtk/gtkpopover.c | 4 +-
gtk/gtkprivate.c | 95 -------------
gtk/gtkprivate.h | 14 --
gtk/gtksearchentry.c | 2 +-
gtk/gtkshortcutcontroller.c | 10 +-
gtk/gtkshortcutlabel.c | 10 +-
gtk/gtkshortcuttrigger.c | 123 ++---------------
gtk/gtkshortcuttrigger.h | 21 +--
gtk/gtkstylecontext.c | 16 ++-
gtk/gtktext.c | 62 +++++----
gtk/gtktextview.c | 31 +++--
gtk/gtktreeview.c | 24 ++--
gtk/gtkwidget.c | 26 ----
gtk/gtkwidget.h | 4 -
gtk/gtkwindow.c | 4 +-
gtk/inspector/object-tree.c | 2 +-
gtk/inspector/resource-list.c | 2 +-
tests/testgtk.c | 7 -
testsuite/gtk/accel.c | 27 ++--
testsuite/gtk/shortcuts.c | 89 ++++++------
testsuite/reftests/meson.build | 8 +-
85 files changed, 1279 insertions(+), 1567 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]