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

[John Ralls <jralls src gnome org>]

commit 457d84ed7e971bf16614753d84c74004952c48b7
Merge: 6a68cd1 d07907d
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jun 6 23:21:11 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/building.sgml  |   56 +++++++------
 gdk/gdkkeysyms.h                  |   82 ++++++++++++++++++
 gdk/win32/rc/gdk.rc.in            |    2 +-
 gtk/Makefile.am                   |    1 +
 gtk/gtk-win32.rc.in               |    2 +-
 gtk/gtkbutton.h                   |    7 --
 gtk/gtkbuttonprivate.h            |   14 +++
 gtk/gtkcontainer.c                |    1 +
 gtk/gtkcontainer.h                |   16 ----
 gtk/gtkcontainerprivate.h         |   44 ++++++++++
 gtk/gtkcustompaperunixdialog.c    |   12 +--
 gtk/gtklockbutton.c               |    2 +-
 gtk/gtkmenubar.c                  |    1 +
 gtk/gtkoffscreenwindow.c          |    1 +
 gtk/gtkprintunixdialog.c          |   15 ++--
 gtk/gtksearchenginetracker.c      |   16 +++-
 gtk/gtksizegroup.c                |    1 +
 gtk/gtkwidget.c                   |    1 +
 gtk/gtkwindow.c                   |    1 +
 modules/input/gtkimcontextime.c   |    3 +
 modules/other/gail/gailmenuitem.c |  164 +++++++++++++++++++++---------------
 21 files changed, 306 insertions(+), 136 deletions(-)
---