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

[John Ralls <jralls src gnome org>]

commit bfea73ae71522ef2fc483825097b60d55d7ced9a
Merge: 0672f99 e10759a
Author: John Ralls <jralls ceridwen us>
Date:   Thu Mar 3 23:21:08 2011 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                         |    2 +-
 docs/reference/gtk/gtk3-sections.txt |    2 +
 gtk/gtkarrow.c                       |    7 +-
 gtk/gtkcellrenderertoggle.c          |    2 +-
 gtk/gtkcheckbutton.c                 |    2 +-
 gtk/gtkcheckmenuitem.c               |    4 +-
 gtk/gtkclipboard.c                   |    2 +-
 gtk/gtkcombobox.c                    |   21 ++++++-
 gtk/gtkentry.c                       |    6 +-
 gtk/gtkmenu.c                        |    6 +-
 gtk/gtkmenuitem.c                    |    7 ++
 gtk/gtknotebook.c                    |  114 +++++++++++++++-------------------
 gtk/gtkrange.c                       |   14 +++-
 gtk/gtkscale.c                       |  100 +++++++++++++++++++----------
 gtk/gtkseparator.c                   |    4 +
 gtk/gtkseparatormenuitem.c           |    4 +
 gtk/gtkseparatortoolitem.c           |    5 ++
 gtk/gtkspinbutton.c                  |    2 +
 gtk/gtkstatusicon.c                  |    9 ++-
 gtk/gtkstylecontext.h                |   32 ++++++++++
 gtk/gtkswitch.c                      |   70 +++++++++++++++------
 gtk/gtkwidget.c                      |    6 +-
 gtk/gtkwindow.c                      |   10 ++--
 tests/testscale.c                    |   25 ++++++++
 24 files changed, 307 insertions(+), 149 deletions(-)
---