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

[John Ralls <jralls src gnome org>]

commit ed3def2b85271c61c2976f50469c9f3a5c7a5d16
Merge: f3fe6a9 e772082
Author: John Ralls <jralls ceridwen us>
Date:   Tue Mar 8 23:21:20 2011 -0800

    Merge branch 'master' into quartz-integration

 NEWS                            |    9 ++++
 configure.ac                    |    4 +-
 docs/reference/gtk/running.sgml |   10 ----
 gdk/gdk.c                       |    4 +-
 gdk/gdkdevice.c                 |    5 +--
 gdk/gdkdisplay.c                |    4 --
 gdk/gdkglobals.c                |    1 -
 gdk/gdkinternals.h              |    1 -
 gdk/gdkwindow.c                 |   96 ++++-----------------------------------
 gdk/win32/gdkwindow-win32.c     |    1 -
 gdk/x11/gdkgeometry-x11.c       |   18 +-------
 gtk/gtkcssprovider.c            |   11 +++++
 gtk/gtkentry.c                  |   61 ++++++++++++++-----------
 gtk/gtksettings.c               |    4 +-
 gtk/gtkstylecontext.h           |    8 +++
 gtk/gtktreeview.c               |   10 ++++-
 16 files changed, 88 insertions(+), 159 deletions(-)
---