[gtk+/gtk-2-24-quartz: 155/155] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit f459be2a1cff59bbff94520cc49c6d399be1dabf
Merge: e72dfb2 bfb50d5
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 7 15:01:26 2012 -0800

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 NEWS                                               |   42 +++
 configure.in                                       |    6 +-
 demos/gtk-demo/drawingarea.c                       |    2 +-
 docs/reference/gdk/tmpl/x_interaction.sgml         |    4 +-
 docs/reference/gtk/migrating-GtkComboBox.sgml      |   16 +-
 docs/reference/gtk/tmpl/gtkbindings.sgml           |    2 +-
 docs/reference/gtk/tmpl/gtkcelllayout.sgml         |    2 +-
 docs/reference/gtk/tmpl/gtkcontainer.sgml          |    6 +-
 docs/reference/gtk/tmpl/gtkdialog.sgml             |    6 +-
 docs/reference/gtk/tmpl/gtkfilechooserdialog.sgml  |    4 +-
 docs/reference/gtk/tmpl/gtkliststore.sgml          |    6 +-
 docs/reference/gtk/tmpl/gtkobject.sgml             |   14 +-
 .../reference/gtk/tmpl/gtkrecentchooserdialog.sgml |    4 +-
 docs/reference/gtk/tmpl/gtksignal.sgml             |   12 +-
 docs/reference/gtk/tmpl/gtkstyle.sgml              |    2 +-
 docs/reference/gtk/tmpl/gtktextbuffer.sgml         |    6 +-
 docs/reference/gtk/tmpl/gtktreemodel.sgml          |    4 +-
 docs/reference/gtk/tmpl/gtktreestore.sgml          |    6 +-
 docs/reference/gtk/tmpl/gtktreeview.sgml           |    2 +-
 docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml     |    4 +-
 .../libgail-util/gail-libgail-util-docs.sgml       |    1 +
 gdk/Makefile.am                                    |    1 +
 gdk/gdkinternals.h                                 |    5 +
 gdk/gdkoffscreenwindow.c                           |   10 +-
 gdk/quartz/gdkevents-quartz.c                      |    6 +
 gdk/quartz/gdkwindow-quartz.c                      |   13 +-
 gdk/win32/gdkgc-win32.c                            |    2 +
 gdk/win32/gdkpixmap-win32.c                        |  107 +++++++-
 gdk/win32/gdkwindow-win32.c                        |   21 +-
 gdk/x11/gdkdnd-x11.c                               |   13 +-
 gdk/x11/gdkwindow-x11.c                            |   27 ++-
 gtk/Makefile.am                                    |    4 +-
 gtk/gtkcellrendereraccel.c                         |  202 ++++++++++------
 gtk/gtkiconfactory.c                               |    7 +-
 gtk/gtkmodules.c                                   |    3 +
 gtk/gtkprinteroptionwidget.c                       |   93 +++++--
 gtk/gtkprintsettings.c                             |    2 +-
 gtk/gtkrecentmanager.c                             |   15 +-
 gtk/gtkscale.c                                     |  107 ++++++---
 modules/engines/ms-windows/msw_style.c             |  269 ++++++++++----------
 modules/printbackends/cups/gtkprintbackendcups.c   |   79 ++++++-
 tests/testmerge.c                                  |    6 +-
 42 files changed, 768 insertions(+), 375 deletions(-)
---