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

[John Ralls <jralls src gnome org>]

commit a4141693e5b16203f7637cd4ada2ec20a6424012
Merge: 534a020 e3e9527
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jun 13 23:21:10 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                               |    2 +-
 demos/gtk-demo/colorsel.c                  |    1 -
 gdk/x11/gdkdevicemanager-xi2.c             |    7 +-
 gtk/gtkassistant.c                         |   12 ++-
 gtk/gtkcssparser.c                         |    1 +
 gtk/gtkcssprovider.c                       |   18 ++-
 gtk/gtkroundedbox.c                        |  197 ++++++++++++++++++++++++--
 gtk/gtkroundedboxprivate.h                 |   12 ++
 gtk/gtkstyleproperties.c                   |    6 +-
 gtk/gtkstyleproperty.c                     |  210 ++++++++++++++++++++++++++-
 gtk/gtkstylepropertyprivate.h              |    3 +
 gtk/gtkthemingengine.c                     |  143 ++++++++++++-------
 gtk/gtkwidget.c                            |    2 +
 tests/css/parser/Makefile.am               |    6 +-
 tests/css/parser/colors-errors.css         |   31 ++++
 tests/css/parser/colors-errors.errors      |    8 +
 tests/css/parser/font-family.css           |   65 ---------
 tests/css/parser/font-family.errors        |    8 -
 tests/css/parser/font-family.ref.css       |   27 ----
 tests/reftests/Makefile.am                 |    3 +
 tests/reftests/border-color-default.css    |   17 +++
 tests/reftests/border-color-default.ref.ui |   17 +++
 tests/reftests/border-color-default.ui     |   16 ++
 23 files changed, 620 insertions(+), 192 deletions(-)
---