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

[John Ralls <jralls src gnome org>]

commit 554e65632c95d9de922be07ff8fbe362c4bc0909
Merge: a897d3f 96a4fc4
Author: John Ralls <jralls ceridwen us>
Date:   Tue Dec 14 04:27:32 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |    2 +
 gtk/gtkaboutdialog.c                 |  541 ++++++++++++++++++++++------------
 gtk/gtkcomboboxtext.c                |    3 +
 gtk/gtkcssprovider.c                 |   53 ++++-
 gtk/gtkentry.c                       |  206 +++++++------
 gtk/gtkexpander.c                    |  190 +++++--------
 gtk/gtkinfobar.c                     |  146 ++--------
 gtk/gtknotebook.c                    |  539 +++++++++++++++++++++++----------
 gtk/gtkrange.c                       |  342 +++++++++++-----------
 gtk/gtkscale.c                       |   68 +++--
 gtk/gtkscrollbar.c                   |   12 +-
 gtk/gtkspinbutton.c                  |  243 +++++++++-------
 gtk/gtkstylecontext.c                |   38 +++-
 gtk/gtkstylecontext.h                |   74 +++++-
 gtk/gtkthemingengine.c               |   62 +++--
 gtk/gtkthemingengine.h               |    2 +
 gtk/gtkwidget.c                      |   22 +-
 gtk/gtkwidgetprivate.h               |    5 +
 18 files changed, 1514 insertions(+), 1034 deletions(-)
---