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

[John Ralls <jralls src gnome org>]

commit 3663612559bfb7a23d2d31b190ef8282287c9be2
Merge: 1d28849 15fdf90
Author: John Ralls <jralls ceridwen us>
Date:   Mon Feb 7 23:21:20 2011 -0800

    Merge branch 'master' into quartz-integration

 gtk/gtkassistant.c       |    2 +
 gtk/gtkbutton.c          |    2 +
 gtk/gtkcellarea.c        |    4 +-
 gtk/gtkcombobox.c        |    2 +
 gtk/gtkcontainer.c       |    5 +-
 gtk/gtkdialog.c          |    2 +
 gtk/gtkentry.c           |    2 +
 gtk/gtkfontsel.c         |    2 +
 gtk/gtkhandlebox.c       |    2 +
 gtk/gtkiconview.c        |    2 +
 gtk/gtkimage.c           |    6 +--
 gtk/gtkinfobar.c         |    2 +
 gtk/gtklabel.c           |    2 +
 gtk/gtklinkbutton.c      |    4 +-
 gtk/gtkliststore.c       |    4 +-
 gtk/gtkmenu.c            |    2 +
 gtk/gtkmessagedialog.c   |    2 +-
 gtk/gtksizegroup.c       |  113 +++++++++++-----------------------------------
 gtk/gtkstylecontext.c    |   29 ++++++++----
 gtk/gtkstyleproperties.c |    5 +-
 gtk/gtktextview.c        |    2 +
 gtk/gtktoolbar.c         |    4 +-
 gtk/gtktoolbutton.c      |    2 +
 gtk/gtktreestore.c       |    4 +-
 gtk/gtktreeview.c        |    2 +
 gtk/gtkviewport.c        |    4 +-
 gtk/gtkwidget.c          |  100 ++++++++++++++++++++++++++++++++++------
 gtk/gtkwidgetprivate.h   |   12 +++++
 gtk/gtkwindow.c          |    2 +
 29 files changed, 195 insertions(+), 131 deletions(-)
---