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

[John Ralls <jralls src gnome org>]

commit 40450bcfb9d3d969713dad85782911d5ce9fca77
Merge: d5e74f0 ac00e77
Author: John Ralls <jralls ceridwen us>
Date:   Tue Dec 28 23:21:22 2010 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtkcssprovider.c      |    2 +-
 gtk/gtkeventbox.c         |   20 ++--
 gtk/gtkfilechooserentry.c |   34 ++++---
 gtk/gtkframe.c            |  171 +++++++++++++++++++++-------------
 gtk/gtkhandlebox.c        |  129 +++++++++++++------------
 gtk/gtkprogressbar.c      |  225 ++++++++++++++++++++++++++-------------------
 gtk/gtkscrolledwindow.c   |  112 ++++++++++++++++-------
 gtk/gtkstyle.c            |   39 ++++++---
 gtk/gtkstylecontext.h     |    8 ++
 gtk/gtkswitch.c           |  152 +++++++++++++++++-------------
 gtk/gtktextview.c         |    4 +-
 gtk/gtktoolbar.c          |  174 ++++++++++++++++++++---------------
 12 files changed, 635 insertions(+), 435 deletions(-)
---