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

[John Ralls <jralls src gnome org>]

commit d970483c454251446d939847013fd50321b440d9
Merge: f726f33 111b7fd
Author: John Ralls <jralls ceridwen us>
Date:   Fri May 6 23:21:06 2011 -0700

    Merge branch 'master' into quartz-integration

 NEWS                                              |   64 ++
 configure.ac                                      |    2 +-
 demos/gtk-demo/assistant.c                        |   37 +-
 docs/Makefile.am                                  |    1 -
 docs/reference/gtk/Makefile.am                    |    3 +
 docs/reference/gtk/gtk-docs.sgml                  |    1 +
 docs/reference/gtk/gtk3-sections.txt              |   22 +
 docs/reference/gtk/gtk3.types                     |    1 +
 docs/reference/gtk/images/lockbutton-locked.png   |  Bin 0 -> 1687 bytes
 docs/reference/gtk/images/lockbutton-sorry.png    |  Bin 0 -> 1347 bytes
 docs/reference/gtk/images/lockbutton-unlocked.png |  Bin 0 -> 1381 bytes
 docs/reference/gtk/images/lockbutton.png          |  Bin 0 -> 2355 bytes
 docs/reference/gtk/visual_index.xml               |    3 +
 docs/tools/widgets.c                              |   49 +
 gtk/Makefile.am                                   |    2 +
 gtk/gtk.h                                         |    1 +
 gtk/gtk.symbols                                   |    5 +
 gtk/gtkarrow.c                                    |   11 +-
 gtk/gtkassistant.c                                | 1036 +++++++--------------
 gtk/gtkassistant.h                                |   56 +-
 gtk/gtkcellrendererprogress.c                     |   11 +-
 gtk/gtkcontainer.c                                |   78 ++-
 gtk/gtkcontainer.h                                |    6 +-
 gtk/gtklockbutton.c                               |  703 ++++++++++++++
 gtk/gtklockbutton.h                               |   70 ++
 gtk/gtkmain.c                                     |    3 +
 gtk/gtkprogressbar.c                              |    3 +-
 gtk/gtktextattributes.c                           |  106 ++-
 gtk/gtktextattributes.h                           |   12 +-
 gtk/gtktextdisplay.c                              |  129 ++--
 gtk/gtktextlayout.c                               |   38 +-
 gtk/gtktextlayout.h                               |    3 +-
 gtk/gtktexttag.c                                  |  229 ++++-
 gtk/gtkwidget.c                                   |   32 +-
 gtk/gtkwindow.c                                   |   36 +
 po-properties/POTFILES.in                         |    1 +
 po/POTFILES.in                                    |    1 +
 tests/Makefile.am                                 |   11 +-
 tests/reftests/Makefile.am                        |    4 +-
 tests/testassistant.c                             |   80 ++-
 tests/testlockbutton.c                            |  277 ++++++
 tests/testtextview.c                              |  182 ++++
 42 files changed, 2369 insertions(+), 940 deletions(-)
---