[gtk+/quartz-integration: 10/10] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit 793a86335fcebab8693c6b151afbd9cad7144401
Merge: 332eaea 3bfa69f
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jul 17 23:21:05 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/gdkwindow.c                        |    2 +-
 gtk/a11y/gtkbuttonaccessible.c         |    2 +-
 gtk/a11y/gtkcellaccessible.c           |    4 +-
 gtk/a11y/gtkcomboboxaccessible.c       |    2 +-
 gtk/a11y/gtkcontaineraccessible.c      |    8 ++--
 gtk/a11y/gtkentryaccessible.c          |   10 +++---
 gtk/a11y/gtkexpanderaccessible.c       |    4 +-
 gtk/a11y/gtklabelaccessible.c          |    4 +-
 gtk/a11y/gtkmenuaccessible.c           |    2 +-
 gtk/a11y/gtkmenuitemaccessible.c       |    8 ++--
 gtk/a11y/gtknotebookaccessible.c       |    8 ++--
 gtk/a11y/gtkpanedaccessible.c          |    2 +-
 gtk/a11y/gtkscalebuttonaccessible.c    |    2 +-
 gtk/a11y/gtkscrolledwindowaccessible.c |    4 +-
 gtk/a11y/gtksubmenuitemaccessible.c    |    4 +-
 gtk/a11y/gtktextcellaccessible.c       |    8 ++--
 gtk/a11y/gtktextviewaccessible.c       |   20 +++++-----
 gtk/a11y/gtktreeviewaccessible.c       |   34 +++++++++---------
 gtk/a11y/gtkwidgetaccessible.c         |   62 +++++++------------------------
 gtk/a11y/gtkwidgetaccessible.h         |   10 +----
 gtk/a11y/gtkwindowaccessible.c         |   21 ++++-------
 gtk/gtkassistant.c                     |   11 ++++--
 tests/a11y/Makefile.am                 |    3 +-
 tests/a11y/appchooser.txt              |   16 +-------
 tests/a11y/menus.txt                   |    7 +++-
 tests/a11y/tree.txt                    |   24 ------------
 26 files changed, 105 insertions(+), 177 deletions(-)
---