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

[John Ralls <jralls src gnome org>]

commit 851abe74405060e152ba04e991951415b5c5d7b1
Merge: 6e9fbc5 5bc0cf1
Author: John Ralls <jralls ceridwen us>
Date:   Fri Dec 24 23:21:05 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gdk/Makefile.am        |  171 ++++++++++++++++-----------------
 docs/reference/gdk/gdk-docs.sgml      |    3 +-
 docs/reference/gdk/gdk3-sections.txt  |  106 +++++++++++---------
 docs/reference/gdk/gdk3.types         |   10 ++-
 docs/reference/gtk/migrating-2to3.xml |    2 +-
 gdk/gdk.c                             |   15 +--
 gdk/gdkapplaunchcontext.c             |    4 +-
 gdk/gdkapplaunchcontext.h             |   18 ++--
 gdk/gdkapplaunchcontextprivate.h      |    7 ++
 gdk/gdkcursor.h                       |    3 -
 gdk/gdkcursorprivate.h                |    4 +
 gdk/gdkdevice.c                       |   13 +++
 gdk/gdkdevice.h                       |    4 +-
 gdk/gdkdevicemanager.c                |  110 ++++++++++++---------
 gdk/gdkdevicemanager.h                |    5 -
 gdk/gdkdevicemanagerprivate.h         |    9 ++
 gdk/gdkdeviceprivate.h                |    1 +
 gdk/gdkdisplay.c                      |   52 ++++++++---
 gdk/gdkdisplay.h                      |   93 +++++++++---------
 gdk/gdkdisplaymanager.c               |   14 +++-
 gdk/gdkdisplaymanager.h               |    6 +-
 gdk/gdkdisplaymanagerprivate.h        |    6 +
 gdk/gdkdisplayprivate.h               |    5 +
 gdk/gdkdnd.h                          |   62 +++++-------
 gdk/gdkdndprivate.h                   |    9 ++
 gdk/gdkkeys.h                         |    5 -
 gdk/gdkkeysprivate.h                  |    6 +
 gdk/gdkmain.h                         |   13 ++-
 gdk/gdkscreen.h                       |   33 +++----
 gdk/gdkscreenprivate.h                |    6 +
 gdk/gdktypes.h                        |   32 ++++---
 gdk/gdkvisual.c                       |  111 +++++++++++-----------
 gdk/gdkvisual.h                       |   25 ++---
 gdk/gdkvisualprivate.h                |    7 ++
 gdk/gdkwindow.c                       |   79 +++++++++------
 gdk/tests/Makefile.am                 |    4 +
 gdk/tests/encoding.c                  |   46 +++++++++
 gdk/x11/gdkmain-x11.c                 |   36 +++++++-
 gdk/x11/gdkselection-x11.c            |    4 +-
 gdk/x11/gdkx.h                        |   23 +----
 gdk/x11/gdkx11screen.h                |   22 ++---
 gtk/gtkhsv.c                          |   52 +++++-----
 gtk/gtkshow.c                         |    2 +-
 gtk/gtktreeview.c                     |   63 +++++++++----
 tests/testgtk.c                       |   61 +++++++-----
 45 files changed, 790 insertions(+), 572 deletions(-)
---