[gtk: 24/24] Merge branch 'matthiasc/for-master' into 'master'



commit c4b2112f16537db94b4a2e1f99183023d5dc323a
Merge: 0c9a0dfed1 3132353ec5
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 28 23:47:09 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #2743
    
    See merge request GNOME/gtk!2161

 demos/gtk-demo/main.c                |  10 ---
 docs/reference/gdk/gdk4-sections.txt |   2 +-
 docs/reference/gtk/gtk4-sections.txt |  15 +++-
 docs/reference/gtk/running.md        |   7 +-
 docs/reference/gtk/wayland.md        |  11 ++-
 docs/reference/gtk/windows.md        |   7 +-
 gdk/gdk-private.h                    |  11 +++
 gdk/gdk.c                            | 146 ++++++++++++++++++++++++++++-------
 gdk/gdkdevice.h                      |  10 +--
 gdk/gdkevents.c                      |   2 +-
 gdk/wayland/gdkdisplay-wayland.c     |   3 +
 gsk/gskdebug.c                       |  39 +++++-----
 gtk.supp                             |   8 ++
 gtk/gtkbitset.c                      |  52 +++++++------
 gtk/gtkdebug.h                       |  17 ++--
 gtk/gtkmain.c                        |  55 ++++++-------
 gtk/gtkmultiselection.c              |   8 +-
 gtk/gtkshortcutaction.c              |   2 +-
 gtk/gtksorter.h                      |   7 +-
 gtk/gtkstack.c                       |  16 ++--
 gtk/gtkstack.h                       |   7 +-
 gtk/gtkstringlist.c                  |   2 +-
 gtk/gtkwidget.c                      |   4 +-
 tests/testcombochange.c              |   9 ---
 tests/testdnd.c                      |   9 ---
 tests/testgtk.c                      |  11 +--
 testsuite/gtk/bitset.c               |  70 +++++++++++++++++
 testsuite/gtk/meson.build            |   4 +-
 testsuite/meson.build                |   5 +-
 29 files changed, 350 insertions(+), 199 deletions(-)
---


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