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

[John Ralls <jralls src gnome org>]

commit 29d8bd883c2832c863b5d2a524e455c08176e945
Merge: 19a7f68 62ba858
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 10 23:21:25 2011 -0800

    Merge branch 'master' into quartz-integration

 Makefile.am                                    |    1 -
 NEWS                                           |   37 ++
 configure.ac                                   |    2 +-
 demos/gtk-demo/offscreen_window.c              |    1 -
 demos/gtk-demo/offscreen_window2.c             |    1 -
 docs/reference/gtk/gtk3-sections.txt           |   43 +++-
 docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml |   18 +
 gdk/win32/gdkdisplaymanager-win32.c            |  135 +++++++
 gtk/Makefile.am                                |    8 +-
 gtk/gtk.symbols                                |    4 +
 gtk/gtkcalendar.c                              |  449 ++++++++++++------------
 gtk/gtkcellarea.c                              |    3 +
 gtk/gtkcellareabox.c                           |    3 +
 gtk/gtkcomboboxtext.c                          |  233 ++++++++++++-
 gtk/gtkcssprovider.c                           |   51 +++-
 gtk/gtkentry.c                                 |    6 +-
 gtk/gtkmenutoolbutton.c                        |   33 ++-
 gtk/gtknumerableicon.c                         |    8 +-
 gtk/gtkorientable.c                            |   18 +
 gtk/gtkpaned.c                                 |    4 +
 gtk/gtkplug-x11.c                              |   15 -
 gtk/gtkstylecontext.c                          |   77 ++++-
 gtk/gtkstylecontext.h                          |   25 ++
 gtk/gtktextdisplay.c                           |  179 ++++++----
 gtk/gtktexttagtable.c                          |   53 +++-
 gtk/gtktextutil.c                              |   64 +++-
 gtk/gtktextview.c                              |   27 +-
 gtk/gtkthemingengine.c                         |    8 +-
 gtk/gtkwidget.c                                |  160 +++++++++-
 gtk/gtkwidget.h                                |   10 +-
 gtk/gtkwindow.c                                |   24 ++
 gtk/gtkwindow.h                                |    2 +
 modules/engines/ms-windows/Makefile.am         |    4 +-
 modules/engines/pixbuf/Makefile.am             |    4 +-
 modules/other/gail/libgail-util/Makefile.am    |    4 +-
 modules/other/gail/tests/Makefile.am           |   70 ++--
 po-properties/POTFILES.in                      |    1 +
 tests/testtreeedit.c                           |   64 +++-
 38 files changed, 1423 insertions(+), 426 deletions(-)
---