[gtk: 118/118] Merge branch 'a11y/atspi' into 'master'




commit 9c28ecb0da9920e173cb99dc141a4321280c8ffb
Merge: 2488d71a0a 8737692b2b
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 15 14:59:24 2020 +0000

    Merge branch 'a11y/atspi' into 'master'
    
    A11y/atspi
    
    See merge request GNOME/gtk!2698

 .gitlab-ci.yml                              |    1 +
 docs/reference/gtk/section-accessibility.md |   10 +
 gtk/a11y/atspi/Accessibility.xml            |   22 +
 gtk/a11y/atspi/Accessible.xml               |   71 ++
 gtk/a11y/atspi/Action.xml                   |   38 +
 gtk/a11y/atspi/Application.xml              |   26 +
 gtk/a11y/atspi/Cache.xml                    |   21 +
 gtk/a11y/atspi/Collection.xml               |   48 +
 gtk/a11y/atspi/Component.xml                |   86 ++
 gtk/a11y/atspi/DeviceEventController.xml    |   64 ++
 gtk/a11y/atspi/DeviceEventListener.xml      |   12 +
 gtk/a11y/atspi/Document.xml                 |   24 +
 gtk/a11y/atspi/EditableText.xml             |   40 +
 gtk/a11y/atspi/Event.xml                    |  193 ++++
 gtk/a11y/atspi/Hyperlink.xml                |   27 +
 gtk/a11y/atspi/Hypertext.xml                |   21 +
 gtk/a11y/atspi/Image.xml                    |   27 +
 gtk/a11y/atspi/Registry.xml                 |   30 +
 gtk/a11y/atspi/Selection.xml                |   42 +
 gtk/a11y/atspi/Socket.xml                   |   27 +
 gtk/a11y/atspi/Table.xml                    |  135 +++
 gtk/a11y/atspi/TableCell.xml                |   22 +
 gtk/a11y/atspi/Text.xml                     |  170 ++++
 gtk/a11y/atspi/Value.xml                    |   14 +
 gtk/a11y/atspi/meson.build                  |   65 ++
 gtk/a11y/gtkatspicache.c                    |  218 ++++
 gtk/a11y/gtkatspicacheprivate.h             |   44 +
 gtk/a11y/gtkatspicontext.c                  | 1416 ++++++++++++++++++++++++++
 gtk/a11y/gtkatspicontextprivate.h           |   42 +
 gtk/a11y/gtkatspieditabletext.c             |  356 +++++++
 gtk/a11y/gtkatspieditabletextprivate.h      |   30 +
 gtk/a11y/gtkatspipango.c                    | 1257 +++++++++++++++++++++++
 gtk/a11y/gtkatspipangoprivate.h             |   62 ++
 gtk/a11y/gtkatspiprivate.h                  |  249 +++++
 gtk/a11y/gtkatspiroot.c                     |  603 +++++++++++
 gtk/a11y/gtkatspirootprivate.h              |   45 +
 gtk/a11y/gtkatspiselection.c                | 1060 +++++++++++++++++++
 gtk/a11y/gtkatspiselectionprivate.h         |   39 +
 gtk/a11y/gtkatspitext.c                     | 1452 +++++++++++++++++++++++++++
 gtk/a11y/gtkatspitextbuffer.c               |  984 ++++++++++++++++++
 gtk/a11y/gtkatspitextbufferprivate.h        |   55 +
 gtk/a11y/gtkatspitextprivate.h              |   45 +
 gtk/a11y/gtkatspiutils.c                    |  307 ++++++
 gtk/a11y/gtkatspiutilsprivate.h             |   34 +
 gtk/a11y/gtkatspivalue.c                    |  129 +++
 gtk/a11y/gtkatspivalueprivate.h             |   30 +
 gtk/a11y/meson.build                        |   23 +
 gtk/gtk-autocleanups.h                      |    1 -
 gtk/gtkaccessible.c                         |  192 ++++
 gtk/gtkaccessibleattributesetprivate.h      |    2 +-
 gtk/gtkaccessibleprivate.h                  |   15 +-
 gtk/gtkatcontext.c                          |  187 +++-
 gtk/gtkatcontext.h                          |    3 +-
 gtk/gtkatcontextprivate.h                   |   20 +
 gtk/gtkcolumnview.c                         |   47 +-
 gtk/gtkcolumnviewcell.c                     |    1 +
 gtk/gtkcolumnviewtitle.c                    |    1 +
 gtk/gtkcombobox.c                           |    5 +
 gtk/gtkdropdown.c                           |    5 +
 gtk/gtkentry.c                              |   35 +
 gtk/gtkenums.h                              |   22 +-
 gtk/gtkflowbox.c                            |   23 +
 gtk/gtkgizmo.c                              |   21 +
 gtk/gtkgizmoprivate.h                       |   10 +
 gtk/gtkgridview.c                           |    7 +
 gtk/gtklistbase.c                           |    1 +
 gtk/gtklistbaseprivate.h                    |    1 +
 gtk/gtklistbox.c                            |   36 +-
 gtk/gtklistitemmanager.c                    |    6 +-
 gtk/gtklistitemmanagerprivate.h             |    2 +
 gtk/gtklistitemwidget.c                     |    8 +-
 gtk/gtklistitemwidgetprivate.h              |    3 +-
 gtk/gtklistview.c                           |   24 +-
 gtk/gtklistview.h                           |    2 +
 gtk/gtklistviewprivate.h                    |   45 +
 gtk/gtknotebook.c                           |   48 +-
 gtk/gtkpaned.c                              |    8 +
 gtk/gtkpasswordentry.c                      |   28 +
 gtk/gtkscalebutton.c                        |   17 +
 gtk/gtksearchentry.c                        |   29 +
 gtk/gtkspinbutton.c                         |   38 +
 gtk/gtkspinbuttonprivate.h                  |   27 +
 gtk/gtkstack.c                              |   58 +-
 gtk/gtkstackswitcher.c                      |   22 +-
 gtk/gtktestatcontext.c                      |    2 +
 gtk/gtktext.c                               |   47 +-
 gtk/gtkwidget.c                             |   31 +-
 gtk/meson.build                             |    2 +
 testsuite/a11y/accessible.c                 |    4 +-
 testsuite/css/api.test.in                   |    2 +-
 testsuite/css/change/change.test.in         |    2 +-
 testsuite/css/change/meson.build            |   13 +-
 testsuite/css/meson.build                   |   27 +-
 testsuite/css/nodes/meson.build             |   13 +-
 testsuite/css/nodes/nodes.test.in           |    2 +-
 testsuite/css/parser/parser.test.in         |    2 +-
 testsuite/css/style/meson.build             |   13 +-
 testsuite/css/style/style.test.in           |    2 +-
 testsuite/gdk/gdk.test.in                   |    2 +-
 testsuite/gdk/meson.build                   |   33 +-
 testsuite/gsk/meson.build                   |    3 +
 testsuite/gsk/render-nodes-cairo.test.in    |    2 +-
 testsuite/gsk/render-nodes-vulkan.test.in   |    2 +-
 testsuite/gtk/gtk.test.in                   |    2 +-
 testsuite/gtk/meson.build                   |   32 +-
 testsuite/reftests/meson.build              |   17 +-
 testsuite/reftests/reftests-dark.test.in    |    2 +-
 testsuite/reftests/reftests-hc.test.in      |    2 +-
 testsuite/reftests/reftests-hci.test.in     |    2 +-
 testsuite/reftests/reftests.test.in         |    2 +-
 testsuite/tools/meson.build                 |    1 +
 testsuite/tools/tools.test.in               |    2 +-
 112 files changed, 10821 insertions(+), 161 deletions(-)
---
diff --cc gtk/gtklistview.c
index 5382c7b1ad,95091e1f13..ad8f8ea16c
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@@ -28,7 -28,9 +28,8 @@@
  #include "gtkmain.h"
  #include "gtkprivate.h"
  #include "gtkrbtreeprivate.h"
 -#include "gtkstylecontext.h"
  #include "gtkwidgetprivate.h"
+ #include "gtkmultiselection.h"
  
  /* Maximum number of list items created by the listview.
   * For debugging, you can set this to G_MAXUINT to ensure


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