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

[John Ralls <jralls src gnome org>]

commit 2bbc232a758f4c1a08b639aa335746a97a012b13
Merge: 15c5fcf cfffa32
Author: John Ralls <jralls ceridwen us>
Date:   Wed Jun 1 23:21:08 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                             |    4 +-
 demos/gtk-demo/pickers.c                 |   23 +-
 docs/reference/gtk/gtk3-sections.txt     |    7 +-
 gtk/Makefile.am                          |    2 +
 gtk/gtk.symbols                          |    7 +-
 gtk/gtkanimationdescription.c            |   13 +-
 gtk/gtkanimationdescription.h            |    3 +-
 gtk/gtkbox.c                             |  147 +++++-
 gtk/gtkcontainer.c                       |    4 +-
 gtk/gtkcssparser.c                       |    4 +-
 gtk/gtkcssprovider.c                     |   94 +--
 gtk/gtkcssselector.c                     |   35 +-
 gtk/gtkcsstypes.c                        |   35 +
 gtk/gtkcsstypesprivate.h                 |   50 ++
 gtk/gtkcustompaperunixdialog.c           |   82 ++-
 gtk/gtkframe.c                           |    4 +-
 gtk/gtknotebook.c                        |  504 +++++++++------
 gtk/gtkshadow.c                          |   29 +-
 gtk/gtkshadowprivate.h                   |    3 +-
 gtk/gtkstyle.h                           |    5 -
 gtk/gtkstylecontext.c                    |   73 +--
 gtk/gtkstyleproperties.c                 |  215 +------
 gtk/gtkstyleproperties.h                 |    4 -
 gtk/gtkstyleproperty.c                   |  998 +++++++++++++++++++++++-------
 gtk/gtkstylepropertyprivate.h            |   53 ++-
 gtk/gtkthemingengine.c                   |  344 +++++++----
 gtk/gtktreeview.c                        |    2 +
 gtk/gtkwidget.c                          |   72 ++-
 gtk/gtkwidgetpath.c                      |  209 ++++++-
 gtk/gtkwidgetpath.h                      |   27 +-
 tests/Makefile.am                        |    6 +
 tests/css/parser/Makefile.am             |    9 +
 tests/css/parser/border-radius.css       |  117 ++++
 tests/css/parser/border-radius.errors    |   13 +
 tests/css/parser/border-radius.ref.css   |  111 ++++
 tests/css/parser/font-family.css         |   65 ++
 tests/css/parser/font-family.errors      |    8 +
 tests/css/parser/font-family.ref.css     |   27 +
 tests/css/parser/single-slash.css        |    1 +
 tests/css/parser/single-slash.errors     |    1 +
 tests/reftests/Makefile.am               |    6 +
 tests/reftests/box-pseudo-classes.css    |   50 ++
 tests/reftests/box-pseudo-classes.ref.ui |  299 +++++++++
 tests/reftests/box-pseudo-classes.ui     |  284 +++++++++
 tests/reftests/no-colors.css             |    7 +
 tests/reftests/no-colors.ref.ui          |   15 +
 tests/reftests/no-colors.ui              |   15 +
 tests/testboxcss.c                       |  204 ++++++
 tests/testcalendar.c                     |    2 +-
 tests/testgtk.css                        |    2 +-
 50 files changed, 3275 insertions(+), 1019 deletions(-)
---