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

[John Ralls <jralls src gnome org>]

commit 2971c78351727546f3586383dff9b6050d9f7507
Merge: bc11fc8 c628538
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jun 4 23:21:09 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/gtkmenu.c          |    1 +
 gtk/gtkmenuitem.c      |    1 +
 gtk/gtkpaned.c         |   20 +++++++++++++++-----
 gtk/gtkwidget.c        |    4 ++--
 gtk/gtkwidget.h        |   41 -----------------------------------------
 gtk/gtkwidgetprivate.h |   42 ++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 61 insertions(+), 48 deletions(-)
---