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

[John Ralls <jralls src gnome org>]

commit b8a70dc6329786fe257fa2866ce8118b7bdcfe3b
Merge: d6d3535 5d106e6
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 12 23:21:13 2011 -0700

    Merge branch 'master' into quartz-integration

 Makefile.am                                |    4 +-
 configure.ac                               |   21 +-
 docs/reference/gtk/tmpl/.gitignore         |    4 +
 docs/reference/gtk/tmpl/gtkframe.sgml      |  160 ----
 docs/reference/gtk/tmpl/gtkhbbox.sgml      |   68 --
 docs/reference/gtk/tmpl/gtkmenuitem.sgml   |   18 +
 docs/reference/gtk/tmpl/gtkstatusicon.sgml |  504 ----------
 docs/reference/gtk/tmpl/gtktable.sgml      |  314 -------
 gdk/Makefile.am                            |    6 +-
 gdk/broadway/broadway-demo.c               |    2 +-
 gdk/broadway/broadway.c                    |   54 +-
 gdk/broadway/broadway.h                    |   16 +-
 gdk/broadway/broadway.js                   |  300 ++++---
 gdk/broadway/gdkwindow-broadway.c          |   37 +-
 gdk/gdkcursorprivate.h                     |    3 +-
 gdk/gdkdisplaymanager.c                    |    9 +
 gdk/gdkdisplayprivate.h                    |    9 +-
 gdk/gdkinternals.h                         |   49 +-
 gdk/gdkscreenprivate.h                     |    5 +-
 gdk/wayland/Makefile.am                    |   40 +
 gdk/wayland/gdkapplaunchcontext-wayland.c  |   90 ++
 gdk/wayland/gdkcursor-wayland.c            |  383 ++++++++
 gdk/wayland/gdkdevice-wayland.c            |  713 ++++++++++++++
 gdk/wayland/gdkdisplay-wayland.c           |  643 +++++++++++++
 gdk/wayland/gdkdisplay-wayland.h           |  101 ++
 gdk/wayland/gdkdisplaymanager-wayland.c    |  318 +++++++
 gdk/wayland/gdkdnd-wayland.c               |  185 ++++
 gdk/wayland/gdkeventsource.c               |  177 ++++
 gdk/wayland/gdkkeys-wayland.c              |  654 +++++++++++++
 gdk/wayland/gdkprivate-wayland.h           |  153 +++
 gdk/wayland/gdkscreen-wayland.c            |  550 +++++++++++
 gdk/wayland/gdkselection-wayland.c         |   93 ++
 gdk/wayland/gdkwayland.h                   |   38 +
 gdk/wayland/gdkwindow-wayland.c            | 1408 ++++++++++++++++++++++++++++
 gdk/x11/gdkdevicemanager-xi2.c             |    3 +-
 gdk/x11/gdkdeviceprivate-xi.h              |    9 +-
 gdk/x11/gdkdnd-x11.c                       |    7 +-
 gdk/x11/gdkscreen-x11.h                    |   55 +-
 gdk/x11/gdkwindow-x11.h                    |    6 +-
 gdk/x11/gdkxftdefaults.c                   |   11 +-
 gtk/gtkaccellabel.c                        |    4 +-
 gtk/gtkappchooserbutton.c                  |    4 +-
 gtk/gtkappchooserwidget.c                  |   11 +-
 gtk/gtkbox.c                               |    3 +-
 gtk/gtkbutton.c                            |   42 +-
 gtk/gtkbuttonprivate.h                     |   13 +-
 gtk/gtkcellareabox.c                       |    3 +-
 gtk/gtkcellrendereraccel.c                 |    4 +-
 gtk/gtkcellrendererpixbuf.c                |    4 +-
 gtk/gtkcellrenderertext.c                  |    5 +-
 gtk/gtkcellview.c                          |   10 +-
 gtk/gtkcombobox.c                          |  150 ++--
 gtk/gtkentrybuffer.c                       |    4 +-
 gtk/gtkframe.c                             |   37 +
 gtk/gtkhbbox.c                             |   34 +
 gtk/gtkicontheme.c                         |   24 +-
 gtk/gtkiconview.c                          |   11 +-
 gtk/gtkimage.c                             |    4 +-
 gtk/gtklabel.c                             |   29 +-
 gtk/gtkliststore.c                         |    3 +-
 gtk/gtkmenuitemprivate.h                   |    9 +-
 gtk/gtknumerableicon.c                     |    3 +-
 gtk/gtkpaned.c                             |    6 +-
 gtk/gtkprogressbar.c                       |    9 +-
 gtk/gtkrange.c                             |    7 +-
 gtk/gtkscrolledwindow.c                    |    7 +-
 gtk/gtkspinbutton.c                        |    3 +-
 gtk/gtkstatusicon.c                        |   30 +
 gtk/gtkstylecontext.c                      |    6 +-
 gtk/gtktable.c                             |  141 +++
 gtk/gtktextbtree.c                         |    8 +-
 gtk/gtktextbuffer.c                        |    5 +-
 gtk/gtktextview.c                          |   11 +-
 gtk/gtktoolbar.c                           |    9 +-
 gtk/gtktoolitem.c                          |   17 +-
 gtk/gtktoolitemgroup.c                     |    5 +-
 gtk/gtktreemodelfilter.c                   |   19 +-
 gtk/gtkwidget.c                            |   28 +-
 gtk/gtkwindow.c                            |   38 +-
 79 files changed, 6433 insertions(+), 1547 deletions(-)
---