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

[John Ralls <jralls src gnome org>]

commit 8380ccfa6fefce48ceae51f02142dff60bad60d0
Merge: fea54da a38d119
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jul 8 07:20:51 2011 -0700

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/Makefile.am              |    2 +-
 demos/pixbuf-demo/Makefile.am           |    2 +-
 docs/reference/gdk/Makefile.am          |    2 +-
 docs/reference/gtk/Makefile.am          |    2 +-
 docs/reference/gtk/migrating-2to3.xml   |    4 +-
 docs/reference/libgail-util/Makefile.am |    2 +-
 docs/tools/Makefile.am                  |    2 +-
 examples/Makefile.am                    |    2 +-
 gdk/Makefile.am                         |    6 +-
 gdk/broadway/Makefile.am                |    2 +-
 gdk/quartz/Makefile.am                  |    2 +-
 gdk/wayland/Makefile.am                 |    2 +-
 gdk/win32/Makefile.am                   |    2 +-
 gdk/x11/Makefile.am                     |    2 +-
 gtk/Makefile.am                         |    6 +-
 gtk/a11y/Makefile.am                    |    2 +-
 gtk/a11y/gailmisc.c                     |  521 --------------------
 gtk/a11y/gtkbuttonaccessible.c          |    1 -
 gtk/a11y/gtkentryaccessible.c           |   41 +--
 gtk/a11y/gtkentryaccessible.h           |    2 -
 gtk/a11y/gtkmenuitemaccessible.c        |    1 +
 gtk/a11y/gtkrangeaccessible.c           |   31 +--
 gtk/a11y/gtkrangeaccessible.h           |    2 -
 gtk/a11y/gtksubmenuitemaccessible.c     |  298 ------------
 gtk/a11y/gtkswitchaccessible.c          |   77 +---
 gtk/a11y/gtkswitchaccessible.h          |    3 -
 gtk/a11y/gtktextviewaccessible.c        |  805 ++++++++++++++++++++++---------
 gtk/a11y/gtktextviewaccessible.h        |   12 +-
 gtk/a11y/gtktreeviewaccessible.c        |    2 +-
 gtk/gtkassistant.c                      |   18 +-
 gtk/gtkcheckmenuitem.c                  |   21 +-
 gtk/gtkhsv.c                            |   16 +-
 gtk/gtklabel.c                          |    2 +-
 gtk/gtkliststore.c                      |    2 +-
 gtk/gtkmenuitem.c                       |   21 +-
 gtk/gtkmodules.c                        |   21 +-
 gtk/gtkpango.c                          |    2 +-
 gtk/gtkradiomenuitem.c                  |   21 +-
 gtk/gtkstyleproperty.c                  |    2 +-
 gtk/gtktable.c                          |    4 +-
 gtk/tests/Makefile.am                   |    2 +-
 modules/engines/ms-windows/Makefile.am  |    2 +-
 modules/engines/pixbuf/Makefile.am      |    2 +-
 modules/printbackends/cups/Makefile.am  |    2 +-
 modules/printbackends/lpr/Makefile.am   |    2 +-
 modules/printbackends/papi/Makefile.am  |    2 +-
 perf/Makefile.am                        |    2 +-
 tests/a11y/Makefile.am                  |    2 +-
 tests/a11y/text.c                       |   25 +-
 49 files changed, 671 insertions(+), 1338 deletions(-)
---